diff --git a/hw/bsp/nordic_pca10095/include/bsp/bsp.h b/hw/bsp/nordic_pca10095/include/bsp/bsp.h
index ee66354b83..26e710eadb 100644
--- a/hw/bsp/nordic_pca10095/include/bsp/bsp.h
+++ b/hw/bsp/nordic_pca10095/include/bsp/bsp.h
@@ -51,32 +51,32 @@ extern uint8_t _ram_start;
 #define BUTTON_4        (9)
 
 /* Arduino pins */
-#define ARDUINO_PIN_D0      32
-#define ARDUINO_PIN_D1      33
-#define ARDUINO_PIN_D2      36
-#define ARDUINO_PIN_D3      37
-#define ARDUINO_PIN_D4      38
-#define ARDUINO_PIN_D5      39
-#define ARDUINO_PIN_D6      40
-#define ARDUINO_PIN_D7      41
-#define ARDUINO_PIN_D8      42
-#define ARDUINO_PIN_D9      43
-#define ARDUINO_PIN_D10     44
-#define ARDUINO_PIN_D11     45
-#define ARDUINO_PIN_D12     46
-#define ARDUINO_PIN_D13     47
-#define ARDUINO_PIN_A0      4
-#define ARDUINO_PIN_A1      5
-#define ARDUINO_PIN_A2      6
-#define ARDUINO_PIN_A3      7
-#define ARDUINO_PIN_A4      25
-#define ARDUINO_PIN_A5      26
+#define ARDUINO_PIN_D0      MYNEWT_VAL(ARDUINO_PIN_D0)
+#define ARDUINO_PIN_D1      MYNEWT_VAL(ARDUINO_PIN_D1)
+#define ARDUINO_PIN_D2      MYNEWT_VAL(ARDUINO_PIN_D2)
+#define ARDUINO_PIN_D3      MYNEWT_VAL(ARDUINO_PIN_D3)
+#define ARDUINO_PIN_D4      MYNEWT_VAL(ARDUINO_PIN_D4)
+#define ARDUINO_PIN_D5      MYNEWT_VAL(ARDUINO_PIN_D5)
+#define ARDUINO_PIN_D6      MYNEWT_VAL(ARDUINO_PIN_D6)
+#define ARDUINO_PIN_D7      MYNEWT_VAL(ARDUINO_PIN_D7)
+#define ARDUINO_PIN_D8      MYNEWT_VAL(ARDUINO_PIN_D8)
+#define ARDUINO_PIN_D9      MYNEWT_VAL(ARDUINO_PIN_D9)
+#define ARDUINO_PIN_D10     MYNEWT_VAL(ARDUINO_PIN_D10)
+#define ARDUINO_PIN_D11     MYNEWT_VAL(ARDUINO_PIN_D11)
+#define ARDUINO_PIN_D12     MYNEWT_VAL(ARDUINO_PIN_D12)
+#define ARDUINO_PIN_D13     MYNEWT_VAL(ARDUINO_PIN_D13)
+#define ARDUINO_PIN_A0      MYNEWT_VAL(ARDUINO_PIN_A0)
+#define ARDUINO_PIN_A1      MYNEWT_VAL(ARDUINO_PIN_A1)
+#define ARDUINO_PIN_A2      MYNEWT_VAL(ARDUINO_PIN_A2)
+#define ARDUINO_PIN_A3      MYNEWT_VAL(ARDUINO_PIN_A3)
+#define ARDUINO_PIN_A4      MYNEWT_VAL(ARDUINO_PIN_A4)
+#define ARDUINO_PIN_A5      MYNEWT_VAL(ARDUINO_PIN_A5)
 
 #define ARDUINO_PIN_RX      ARDUINO_PIN_D0
 #define ARDUINO_PIN_TX      ARDUINO_PIN_D1
 
-#define ARDUINO_PIN_SCL     35
-#define ARDUINO_PIN_SDA     34
+#define ARDUINO_PIN_SCL     MYNEWT_VAL(ARDUINO_PIN_SCL)
+#define ARDUINO_PIN_SDA     MYNEWT_VAL(ARDUINO_PIN_SDA)
 
 #define ARDUINO_PIN_SCK     ARDUINO_PIN_D13
 #define ARDUINO_PIN_MOSI    ARDUINO_PIN_D11
diff --git a/hw/bsp/nordic_pca10095/syscfg.yml b/hw/bsp/nordic_pca10095/syscfg.yml
index d0b2876475..ee718b42d1 100644
--- a/hw/bsp/nordic_pca10095/syscfg.yml
+++ b/hw/bsp/nordic_pca10095/syscfg.yml
@@ -43,6 +43,29 @@ syscfg.defs:
             can reduce size of crash dump.
         value: 0
 
+    ARDUINO_PIN_D0: 32
+    ARDUINO_PIN_D1: 33
+    ARDUINO_PIN_D2: 36
+    ARDUINO_PIN_D3: 37
+    ARDUINO_PIN_D4: 38
+    ARDUINO_PIN_D5: 39
+    ARDUINO_PIN_D6: 40
+    ARDUINO_PIN_D7: 41
+    ARDUINO_PIN_D8: 42
+    ARDUINO_PIN_D9: 43
+    ARDUINO_PIN_D10: 44
+    ARDUINO_PIN_D11: 45
+    ARDUINO_PIN_D12: 46
+    ARDUINO_PIN_D13: 47
+    ARDUINO_PIN_A0: 4
+    ARDUINO_PIN_A1: 5
+    ARDUINO_PIN_A2: 6
+    ARDUINO_PIN_A3: 7
+    ARDUINO_PIN_A4: 25
+    ARDUINO_PIN_A5: 26
+    ARDUINO_PIN_SCL: 35
+    ARDUINO_PIN_SDA: 34
+
 syscfg.vals:
     # Set default pins for peripherals
     UART_0_PIN_TX: 20
diff --git a/hw/usb/tinyusb/std_descriptors/syscfg.yml b/hw/usb/tinyusb/std_descriptors/syscfg.yml
index 75770b133d..ff2eca7459 100644
--- a/hw/usb/tinyusb/std_descriptors/syscfg.yml
+++ b/hw/usb/tinyusb/std_descriptors/syscfg.yml
@@ -105,19 +105,19 @@ syscfg.defs:
 
     USBD_CDC_DESCRIPTOR_STRING:
         description: String for CDC interface
-        value: NULL
+        value: raw("NULL")
 
     USBD_MSC_DESCRIPTOR_STRING:
         description: String for MSC interface
-        value: NULL
+        value: raw("NULL")
 
     USBD_HID_DESCRIPTOR_STRING:
         description: String for HID interface
-        value: NULL
+        value: raw("NULL")
 
     USBD_BTH_DESCRIPTOR_STRING:
         description: String for BT descriptor
-        value: NULL
+        value: raw("NULL")
 
     USBD_HID_REPORT_EP:
         description: HID report endpoint number
diff --git a/hw/usb/tinyusb/syscfg.yml b/hw/usb/tinyusb/syscfg.yml
index dac44d396b..b48a241392 100644
--- a/hw/usb/tinyusb/syscfg.yml
+++ b/hw/usb/tinyusb/syscfg.yml
@@ -25,7 +25,7 @@ syscfg.defs:
     USBD_TASK_PRIORITY:
         description: >
             USBD task priority
-        value: 'OS_TASK_PRI_HIGHEST + 2'
+        value: raw("OS_TASK_PRI_HIGHEST + 2")
     USBD_STACK_SIZE:
         description: >
             Stack size for usbd task
diff --git a/sys/console/full/syscfg.yml b/sys/console/full/syscfg.yml
index 756d5ccd77..af83d354cd 100644
--- a/sys/console/full/syscfg.yml
+++ b/sys/console/full/syscfg.yml
@@ -95,7 +95,7 @@ syscfg.defs:
         value: '115200'
     CONSOLE_UART_FLOW_CONTROL:
         description: 'Console UART flow control.'
-        value: 'UART_FLOW_CTL_NONE'
+        value: raw("UART_FLOW_CTL_NONE")
     CONSOLE_UART_TX_BUF_SIZE:
         description: 'UART console transmit buffer size; must be power of 2.'
         value: 32
diff --git a/sys/console/stub/syscfg.yml b/sys/console/stub/syscfg.yml
index e1d280e8a1..76f656e826 100644
--- a/sys/console/stub/syscfg.yml
+++ b/sys/console/stub/syscfg.yml
@@ -23,7 +23,7 @@ syscfg.defs:
         value: '115200'
     CONSOLE_UART_FLOW_CONTROL:
         description: 'Console UART flow control.'
-        value: 'UART_FLOW_CTL_NONE'
+        value: raw("UART_FLOW_CTL_NONE")
     CONSOLE_UART_DEV:
         description: 'Console UART device.'
         value: '"uart0"'