diff --git a/deploy/firesim b/deploy/firesim
index a236eaca..927fd0ab 100755
--- a/deploy/firesim
+++ b/deploy/firesim
@@ -443,6 +443,7 @@ def main(args: argparse.Namespace) -> None:
     # we elastically spin instances up/down. we can easily get re-used IPs with
     # different keys. also, probably won't get MITM'd
     env.disable_known_hosts = True
+    env.use_ssh_config = True
 
     rootLogger.info("FireSim Manager. Docs: https://docs.fires.im\nRunning: %s\n", str(args.task))
 
diff --git a/sim/make/cpp-lint.mk b/sim/make/cpp-lint.mk
index c1bcf330..9bef6e20 100644
--- a/sim/make/cpp-lint.mk
+++ b/sim/make/cpp-lint.mk
@@ -17,7 +17,7 @@ clang_tidy_files := $(shell \
 		| grep -v fesvr \
 		| grep -v generated-src \
 		| grep -v output \
-		| grep -v -F 'main.cc' \
+		| grep -v -F 'entry.cc' \
 )
 
 clang_tidy_flags :=\
diff --git a/sim/midas/src/main/cc/core/bridge_driver.h b/sim/midas/src/main/cc/core/bridge_driver.h
index cf3014ba..443b8d38 100644
--- a/sim/midas/src/main/cc/core/bridge_driver.h
+++ b/sim/midas/src/main/cc/core/bridge_driver.h
@@ -12,7 +12,7 @@
 #define page_size 4096
 #define page_aligned_sized_array(__NAME__, __SIZE_IN_BYTES__)                  \
   alignas(page_size) char                                                      \
-      __NAME__[(((__SIZE_IN_BYTES__) + page_size - 1) / page_size) *           \
+      (__NAME__)[(((__SIZE_IN_BYTES__) + page_size - 1) / page_size) *           \
                page_size];
 
 // DOC include start: Bridge Driver Interface