diff --git a/src/platform/nrf52/hardfault.cpp b/src/platform/nrf52/hardfault.cpp
index 13a4ee046..7b7a718b8 100644
--- a/src/platform/nrf52/hardfault.cpp
+++ b/src/platform/nrf52/hardfault.cpp
@@ -90,7 +90,7 @@ extern "C" void HardFault_Handler(void)
     asm volatile(" mrs r0,msp\n"
                  " b HardFault_Impl \n");
 }
-#else
+#elif !defined(ARCH_NRF52)
 
 /* The prototype shows it is a naked function - in effect this is just an
 assembly function. */
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 99e9667b6..5bbde2adf 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -2,7 +2,6 @@
 extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
 board = cross_platform
-board_level = extra
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
 
@@ -11,7 +10,6 @@ build_src_filter = ${portduino_base.build_src_filter}
 extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
 board = linux_hardware
-board_level = extra
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}
 
@@ -20,6 +18,5 @@ build_src_filter = ${portduino_base.build_src_filter}
 extends = portduino_base
 build_flags = ${portduino_base.build_flags} -O0 -lgpiod -I variants/portduino
 board = linux_arm
-board_level = extra
 lib_deps = ${portduino_base.lib_deps}
 build_src_filter = ${portduino_base.build_src_filter}