diff --git a/vpr/src/base/vpr_api.cpp b/vpr/src/base/vpr_api.cpp
index 3e545f15af8..00117567972 100644
--- a/vpr/src/base/vpr_api.cpp
+++ b/vpr/src/base/vpr_api.cpp
@@ -370,6 +370,7 @@ void vpr_show_resource_usage(const t_vpr_setup& vpr_setup, const t_arch& Arch)
 {
     vtr::ScopedStartFinishTimer timer("Build Device Grid");
     /* Read in netlist file for placement and routing */
+    auto& cluster_ctx = g_vpr_ctx.clustering();
     auto& device_ctx = g_vpr_ctx.mutable_device();
 
     device_ctx.arch = &Arch;
@@ -853,7 +854,6 @@ RouteStatus vpr_route_flow(const Netlist<>& net_list,
 
         //Initialize the delay calculator
         std::shared_ptr<SetupHoldTimingInfo> timing_info = nullptr;
-
         std::shared_ptr<RoutingDelayCalculator> routing_delay_calc = nullptr;
         if (vpr_setup.Timing.timing_analysis_enabled) {
             auto& atom_ctx = g_vpr_ctx.atom();
diff --git a/vpr/src/draw/draw_basic.cpp b/vpr/src/draw/draw_basic.cpp
index c52f5e9dffe..7bd1940cf87 100644
--- a/vpr/src/draw/draw_basic.cpp
+++ b/vpr/src/draw/draw_basic.cpp
@@ -4,6 +4,7 @@
 #include <cstdio>
 #include <cfloat>
 #include <cstring>
+#define _USE_MATH_DEFINES // ensure (non-standard) value of M_PI is brought in from math.h
 #include <cmath>
 #include <algorithm>
 #include <sstream>