diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c
index 0b719ccf..12bd53c7 100644
--- a/firmware/common/hackrf_core.c
+++ b/firmware/common/hackrf_core.c
@@ -252,7 +252,8 @@ void cpu_clock_init(void)
             | CGU_PLL1_CTRL_PSEL(0)
             | CGU_PLL1_CTRL_NSEL(0)
 			| CGU_PLL1_CTRL_MSEL(16)
-			| CGU_PLL1_CTRL_FBSEL;
+			| CGU_PLL1_CTRL_FBSEL
+			| CGU_PLL1_CTRL_DIRECT;
 
 	/* wait until stable */
 	while (!(CGU_PLL1_STAT & CGU_PLL1_STAT_LOCK));
@@ -368,17 +369,21 @@ void pin_setup(void) {
 	GPIO_DIR(PORT_CPLD_TDI) &= ~PIN_CPLD_TDI;
 	
 	/* Configure SCU Pin Mux as GPIO */
-	scu_pinmux(SCU_PINMUX_LED1, SCU_GPIO_FAST);
-	scu_pinmux(SCU_PINMUX_LED2, SCU_GPIO_FAST);
-	scu_pinmux(SCU_PINMUX_LED3, SCU_GPIO_FAST);
+	scu_pinmux(SCU_PINMUX_LED1, SCU_GPIO_NOPULL);
+	scu_pinmux(SCU_PINMUX_LED2, SCU_GPIO_NOPULL);
+	scu_pinmux(SCU_PINMUX_LED3, SCU_GPIO_NOPULL);
 	
-	scu_pinmux(SCU_PINMUX_EN1V8, SCU_GPIO_FAST);
+	scu_pinmux(SCU_PINMUX_EN1V8, SCU_GPIO_NOPULL);
 	
 	scu_pinmux(SCU_PINMUX_BOOT0, SCU_GPIO_FAST);
 	scu_pinmux(SCU_PINMUX_BOOT1, SCU_GPIO_FAST);
 	scu_pinmux(SCU_PINMUX_BOOT2, SCU_GPIO_FAST);
 	scu_pinmux(SCU_PINMUX_BOOT3, SCU_GPIO_FAST);
 	
+	/* Configure USB indicators */
+	scu_pinmux(SCU_PINMUX_USB_LED0, SCU_CONF_FUNCTION3);
+	scu_pinmux(SCU_PINMUX_USB_LED1, SCU_CONF_FUNCTION3);
+	
 	/* Configure all GPIO as Input (safe state) */
 	GPIO0_DIR = 0;
 	GPIO1_DIR = 0;
diff --git a/firmware/common/hackrf_core.h b/firmware/common/hackrf_core.h
index 71f017da..462f8b1d 100644
--- a/firmware/common/hackrf_core.h
+++ b/firmware/common/hackrf_core.h
@@ -61,6 +61,10 @@ extern "C"
 #define SCU_PINMUX_BOOT2    (P2_8)  /* GPIO5[7] on P2_8 */
 #define SCU_PINMUX_BOOT3    (P2_9)  /* GPIO1[10] on P2_9 */
 
+/* USB peripheral */
+#define SCU_PINMUX_USB_LED0 (P6_8)
+#define SCU_PINMUX_USB_LED1 (P6_7)
+
 /* SSP1 Peripheral PinMux */
 #define SCU_SSP1_MISO       (P1_3)  /* P1_3 */
 #define SCU_SSP1_MOSI       (P1_4)  /* P1_4 */
diff --git a/host/libhackrf/CMakeLists.txt b/host/libhackrf/CMakeLists.txt
index 370a1c2d..000a4326 100644
--- a/host/libhackrf/CMakeLists.txt
+++ b/host/libhackrf/CMakeLists.txt
@@ -31,7 +31,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
 cmake_minimum_required(VERSION 2.8)
 
 add_definitions(-Wall)
-add_definitions(-std=c99)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
 
 find_package(USB1 REQUIRED)
 include_directories(${LIBUSB_INCLUDE_DIR})