diff --git a/Kernel/debug.c b/Kernel/debug.c
index 1718d209bea026fbbe36634eaee2b0d804c4ec47..e799f00f60ad80820e7a761156482ff761d1ad9e 100644
--- a/Kernel/debug.c
+++ b/Kernel/debug.c
@@ -213,10 +213,7 @@ void Panic(const char *Fmt, ...)
 
 	Threads_Dump();
 
-//	__asm__ __volatile__ ("xchg %bx, %bx");
-//	__asm__ __volatile__ ("cli;\n\thlt");
-//	for(;;)	__asm__ __volatile__ ("hlt");
-	for(;;)	;
+	for(;;)	HALT();
 }
 
 void Debug_SetKTerminal(const char *File)
diff --git a/Kernel/time.c b/Kernel/time.c
index 3d06b0e733143c1d1c0570d62e9accc129227a0b..de4394724ca76f836c91b274d9ab5a1d5c7215e9 100644
--- a/Kernel/time.c
+++ b/Kernel/time.c
@@ -84,10 +84,8 @@ void Time_RemoveTimer(int ID)
  */
 void Time_Delay(int Delay)
 {
-	Sint64	dest = now() + Delay;
-	//Log("Time_Delay: dest = %lli", dest);
+	tTime	dest = now() + Delay;
 	while(dest > now())	Threads_Yield();
-	//Log("Time_Delay: giTimestamp = %lli", giTimestamp);
 }
 
 // === EXPORTS ===