diff --git a/libs/bluetooth/jswrap_bluetooth.c b/libs/bluetooth/jswrap_bluetooth.c
index 7addd4b66..8d5cd324b 100644
--- a/libs/bluetooth/jswrap_bluetooth.c
+++ b/libs/bluetooth/jswrap_bluetooth.c
@@ -147,8 +147,7 @@ void jswrap_nrf_init() {
 
 
   if (jsiStatus & JSIS_COMPLETELY_RESET) {
-#ifdef USE_NFC
-#ifdef PUCKJS
+#if defined(USE_NFC) && defined(NFC_DEFAULT_URL)
     // By default Puck.js's NFC will send you to the PuckJS website
     // address is included so Web Bluetooth can connect to the correct one
     JsVar *addr = jswrap_nrf_bluetooth_getAddress();
@@ -156,7 +155,6 @@ void jswrap_nrf_init() {
     jsvUnLock(addr);
     jswrap_nrf_nfcURL(uri);
     jsvUnLock(uri);
-#endif
 #endif
   } else {
 #ifdef USE_NFC
diff --git a/scripts/common.py b/scripts/common.py
index 740148070..28cfe2ef6 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -184,6 +184,9 @@ def get_jsondata(is_for_document, parseArgs = True, board = False):
             if ("#ifdef" in jsondata) or ("#ifndef" in jsondata):
               sys.stderr.write( "'#ifdef' where 'ifdef' should be used in " + jsonstring + " - "+str(sys.exc_info()[0]) + "\n" )
               exit(1)
+            if ("if" in jsondata):
+              sys.stderr.write( "'if' where '#if' should be used in " + jsonstring + " - "+str(sys.exc_info()[0]) + "\n" )
+              exit(1)
             if ("#if" in jsondata):
               expr = jsondata["#if"]
               for defn in defines:
@@ -371,25 +374,27 @@ def get_ifdef_description(d):
   if d=="STM32": return "STM32 devices (including Espruino Original, Pico and WiFi)"
   if d=="STM32F1": return "STM32F1 devices (including Original Espruino Board)"
   if d=="NRF52": return "NRF52 devices (like Puck.js, Pixl.js and MDBT42Q)"
+  if d=="PUCKJS": return "Puck.js devices"
   if d=="PIXLJS": return "Pixl.js boards"
   if d=="ESPRUINOWIFI": return "Espruino WiFi boards"
-  if d=="ESP8266": return "ESP8266 devices running Espruino"
-  if d=="ESP32": return "ESP32 devices"
+  if d=="ESP8266": return "ESP8266 boards running Espruino"
+  if d=="ESP32": return "ESP32 boards"
   if d=="EFM32": return "EFM32 devices"
   if d=="USE_LCD_SDL": return "Linux with SDL support compiled in"
   if d=="USE_TLS": return "devices with TLS and SSL support (Espruino Pico and Espruino WiFi only)"
   if d=="RELEASE": return "release builds"
-  if d=="LINUX": return "Linux-based builds"
   if d=="DEBUG": return "debug builds"
+  if d=="LINUX": return "Linux-based builds"
   if d=="BLUETOOTH": return "devices with Bluetooth LE capability"
   if d=="USB": return "devices with USB"
   if d=="USE_USB_HID": return "devices that support USB HID (Espruino Pico and Espruino WiFi)"
-  if d=="USE_AES": return "devices that support AES (Espruino Pico, Espruino WiFi or Linux, EPS32)"
-  if d=="USE_CRYPTO": return "devices that support Crypto Functionality (Espruino Pico, Espruino WiFi, Linux or ESP8266, ESP32)"
-  if d=="USE_SHA256": return "devices that support SHA256 (Espruino Pico, Espruino WiFi, Espruino BLE devices or Linux, ESP32)"
-  if d=="USE_SHA512": return "devices that support SHA512 (Espruino Pico, Espruino WiFi, Espruino BLE devices or Linux, ESP32)"
+  if d=="USE_AES": return "devices that support AES (Espruino Pico, Espruino WiFi or Linux)"
+  if d=="USE_SHA256": return "devices that support SHA256 (Espruino Pico, Espruino WiFi, Espruino BLE devices or Linux)"
+  if d=="USE_SHA512": return "devices that support SHA512 (Espruino Pico, Espruino WiFi, Espruino BLE devices or Linux)"
+  if d=="USE_CRYPTO": return "devices that support Crypto Functionality (Espruino Pico, Original, Espruino WiFi, Espruino BLE devices, Linux or ESP8266)"
   if d=="USE_FLASHFS": return "devices with filesystem in Flash support enabled (ESP32 only)"
   if d=="USE_TERMINAL": return "devices with VT100 terminal emulation enabled (Pixl.js only)"
+  if d=="USE_TELNET": return "devices with Telnet enabled (Linux, ESP8266 and ESP32)"
   print("WARNING: Unknown ifdef '"+d+"' in common.get_ifdef_description")
   return d