diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index e08f91e513..caf662b6d8 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -334,8 +334,10 @@ static bool command_common(uint8_t code)
         case KC_S:
             print("\n\t- Status -\n");
             print_val_hex8(host_keyboard_leds());
+#ifndef PROTOCOL_VUSB
             print_val_hex8(keyboard_protocol);
             print_val_hex8(keyboard_idle);
+#endif
 #ifdef NKRO_ENABLE
             print_val_hex8(keyboard_nkro);
 #endif
diff --git a/tmk_core/protocol/vusb.mk b/tmk_core/protocol/vusb.mk
index d541dd0fad..d0cdc3d885 100644
--- a/tmk_core/protocol/vusb.mk
+++ b/tmk_core/protocol/vusb.mk
@@ -9,12 +9,12 @@ SRC +=	$(VUSB_DIR)/main.c \
 	$(VUSB_DIR)/usbdrv/oddebug.c
 
 
-ifdef NO_UART
+ifeq (yes,$(strip $(NO_UART)))
 OPT_DEFS += -DNO_UART
 SRC +=	$(COMMON_DIR)/sendchar_null.c
 else
 SRC +=	$(COMMON_DIR)/sendchar_uart.c \
-	$(COMMON_DIR)/uart.c
+	$(COMMON_DIR)/avr/uart.c
 endif