diff --git a/workspace/TS100/Core/BSP/Pine64/Vendor/Lib/gd32vf103_adc.c b/workspace/TS100/Core/BSP/Pine64/Vendor/Lib/gd32vf103_adc.c
index 7b0e743f..5fbdf8dc 100644
--- a/workspace/TS100/Core/BSP/Pine64/Vendor/Lib/gd32vf103_adc.c
+++ b/workspace/TS100/Core/BSP/Pine64/Vendor/Lib/gd32vf103_adc.c
@@ -629,7 +629,7 @@ uint16_t adc_inserted_data_read(uint32_t adc_periph, uint8_t inserted_channel)
         idata = 0U;
         break;
     }
-    return (uint16_t)idata;
+    return (uint16_t)idata& 0xFFFF;
 }
 
 /*!
diff --git a/workspace/TS100/Core/Src/gui.cpp b/workspace/TS100/Core/Src/gui.cpp
index bd22a3b1..cdb9c22e 100644
--- a/workspace/TS100/Core/Src/gui.cpp
+++ b/workspace/TS100/Core/Src/gui.cpp
@@ -68,9 +68,10 @@ static void settings_displayTempChangeLongStep(void);
 static bool settings_setTempChangeLongStep(void);
 static void settings_displayPowerPulse(void);
 static bool settings_setPowerPulse(void);
+#ifdef HALL_SENSOR
 static void settings_displayHallEffect(void);
 static bool settings_setHallEffect(void);
-
+#endif
 // Menu functions
 static void settings_displaySolderingMenu(void);
 static bool settings_enterSolderingMenu(void);
@@ -828,7 +829,7 @@ static void settings_displayPowerPulse(void) {
 	}
 
 }
-
+#ifdef HALL_SENSOR
 static void settings_displayHallEffect(void) {
 	printShortDescription(26, 7);
 	switch (systemSettings.hallEffectSensitivity) {
@@ -852,10 +853,9 @@ static bool settings_setHallEffect(void) {
 	// Off, Low, Medium, High
 	systemSettings.hallEffectSensitivity++;
 	systemSettings.hallEffectSensitivity %= 4;
-
 	return systemSettings.hallEffectSensitivity == 3;
-
 }
+#endif
 static void displayMenu(size_t index) {
 // Call into the menu
 	OLED::setFont(1);
diff --git a/workspace/TS100/Makefile b/workspace/TS100/Makefile
index e9ab7293..880f1995 100644
--- a/workspace/TS100/Makefile
+++ b/workspace/TS100/Makefile
@@ -70,7 +70,7 @@ S_SRCS := $(shell find $(PINE_INC_DIR) -type f -name '*.S')
 ASM_INC = -I$(PINE_RISCV_INC_DIR)
 LDSCRIPT=GD32VF103xB.ld
 DEV_LDFLAGS=-nostartfiles -Xlinker --gc-sections
-DEV_GLOBAL_DEFS=-msmall-data-limit=8 -mno-save-restore -Os -fmessage-length=0 -fsigned-char  -fabi-version=0
+DEV_GLOBAL_DEFS=-msmall-data-limit=8 -mno-save-restore -Os -fmessage-length=0 -fabi-version=0 
 DEV_CFLAGS= -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" 
 DEV_CXXFLAGS= -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" 
 flash_size=128k
@@ -173,10 +173,7 @@ LINKER_FLAGS=$(CPUFLAGS) \
 		-fno-rtti 			\
 		-fno-exceptions 	\
 		-fno-non-call-exceptions \
-		-fno-use-cxa-atexit		\
 		-fno-strict-aliasing 		\
-		-fno-rtti 			\
-		-fno-exceptions		\
 		-fno-threadsafe-statics \
 		-Wl,--wrap=malloc \
 		-Wl,--wrap=free \
@@ -240,8 +237,6 @@ CXXFLAGS=$(CPUFLAGS) \
 		-fno-non-call-exceptions \
 		-fno-use-cxa-atexit		\
 		-fno-strict-aliasing 		\
-		-fno-rtti 			\
-		-fno-exceptions		\
 		-fno-threadsafe-statics \
 		$(DEV_CXXFLAGS)