diff --git a/Makefile b/Makefile
index 15c97de5..4fbba73c 100644
--- a/Makefile
+++ b/Makefile
@@ -83,5 +83,11 @@ clean:
 	cd kernel; $(MAKE) clean
 	cd programs/one; $(MAKE) clean
 	cd programs/hello; $(MAKE) clean
+	cd programs/long;$(MAKE) clean
+	cd programs/loop; $(MAKE) clean
+	cd programs/longone; $(MAKE) clean
+	cd programs/longtwo; $(MAKE) clean
+	cd programs/keyboard; $(MAKE) clean
+	cd programs/tsh; $(MAKE) clean
 	rm -f *.bin
 	rm -f *.flp
diff --git a/cpp.mk b/cpp.mk
index a2160b7e..3bd59151 100644
--- a/cpp.mk
+++ b/cpp.mk
@@ -12,6 +12,6 @@ CPP_FLAGS_32=$(COMMON_CPP_FLAGS) $(CPP_FLAGS_LOW) -mpreferred-stack-boundary=4
 CPP_FLAGS_64=$(COMMON_CPP_FLAGS) -mno-sse -mno-sse2 -mno-sse3 -mno-sse4 -mno-sse4.1 -mno-sse4.2 -mno-avx
 
 COMMON_LINK_FLAGS=-lgcc
-PROGRAM_LINK_FLAGS=$(COMMON_LINK_FLAGS) -z max-page-size=0x1000 -T ../linker.ld
+PROGRAM_LINK_FLAGS=$(COMMON_LINK_FLAGS) -mcmodel=small -fPIC -z max-page-size=0x1000 -T ../linker.ld
 
-PROGRAM_FLAGS=-I../../userlib/include/
+PROGRAM_FLAGS=-I../../userlib/include/ -mcmodel=small -fPIC
diff --git a/kernel/src/scheduler.cpp b/kernel/src/scheduler.cpp
index c6009c85..2c8d59cf 100644
--- a/kernel/src/scheduler.cpp
+++ b/kernel/src/scheduler.cpp
@@ -21,7 +21,7 @@
 #include "physical_allocator.hpp"
 #include "virtual_allocator.hpp"
 
-constexpr const bool DEBUG_SCHEDULER = false;
+constexpr const bool DEBUG_SCHEDULER = true;
 
 //Provided by task_switch.s
 extern "C" {
diff --git a/programs/long/src/main.cpp b/programs/long/src/main.cpp
index d1dfcacc..aa54e971 100644
--- a/programs/long/src/main.cpp
+++ b/programs/long/src/main.cpp
@@ -21,10 +21,14 @@ uint64_t fibonacci_slow(uint64_t s){
 int main(){
     uint64_t i = 0;
 
+    print_line("START");
+
     while(i < 10){
         print_line(fibonacci_slow(current));
         ++i;
     }
 
+    print_line("END");
+
     exit(0);
 }
\ No newline at end of file
diff --git a/programs/tsh/Makefile b/programs/tsh/Makefile
index cce843d7..50a3ad7e 100644
--- a/programs/tsh/Makefile
+++ b/programs/tsh/Makefile
@@ -5,10 +5,10 @@ default: tsh
 include ../../cpp.mk
 
 %.cpp.o: src/%.cpp
-	$(CC) $(PROGRAM_FLAGS) -mcmodel=large $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@
+	$(CC) $(PROGRAM_FLAGS) $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@
 
 tsh: main.cpp.o
-	$(CC) $(PROGRAM_LINK_FLAGS) -mcmodel=small -fPIC $(CPP_FLAGS_64) -o tsh main.cpp.o
+	$(CC) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o tsh main.cpp.o
 
 clean:
 	rm -f *.cpp.o