diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c
index 520a8a64..b696ee77 100644
--- a/src/gos/gos_x_threads.c
+++ b/src/gos/gos_x_threads.c
@@ -122,6 +122,7 @@ void gfxSleepMilliseconds(delaytime_t ms) {
 	case TIME_INFINITE:
 		while(1)
 			gfxYield();
+		return;
 	}
 
 	// Convert our delay to ticks
@@ -143,6 +144,7 @@ void gfxSleepMicroseconds(delaytime_t ms) {
 	case TIME_INFINITE:
 		while(1)
 			gfxYield();
+		return;
 	}
 
 	// Convert our delay to ticks
diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c
index eda88d5a..22ec9ed2 100644
--- a/src/gtimer/gtimer.c
+++ b/src/gtimer/gtimer.c
@@ -109,7 +109,7 @@ static DECLARE_THREAD_FUNCTION(GTimerThreadHandler, arg) {
 		lastTime = tm;
 		gfxMutexExit(&mutex);
 	}
-//	THREAD_RETURN(0);
+	THREAD_RETURN(0);
 }
 
 void _gtimerInit(void)