diff --git a/src/kernel/cli_apps/beep.c b/src/kernel/cli_apps/beep.c
index 7946571..e3d5641 100644
--- a/src/kernel/cli_apps/beep.c
+++ b/src/kernel/cli_apps/beep.c
@@ -11,6 +11,6 @@ void cli_cmd_beep(char *args) {
     outb(0x42, (div >> 8) & 0xFF);
     
     outb(0x61, inb(0x61) | 0x03);
-    cli_delay(10000000);
+    cli_sleep(100);
     outb(0x61, inb(0x61) & 0xFC);
 }
diff --git a/src/kernel/cli_apps/readtheman.c b/src/kernel/cli_apps/readtheman.c
index 6c238f3..1ec3ad0 100644
--- a/src/kernel/cli_apps/readtheman.c
+++ b/src/kernel/cli_apps/readtheman.c
@@ -9,6 +9,6 @@ void cli_cmd_readtheman(char *args) {
     cli_write("Fuck you.\n");
     for(int i=0; i<3; i++) {
         cli_cmd_beep(NULL);
-        cli_delay(1000000);
+        cli_sleep(10);
     }
 }
diff --git a/src/kernel/cli_apps/reboot.c b/src/kernel/cli_apps/reboot.c
index bc38a5a..6b165ad 100644
--- a/src/kernel/cli_apps/reboot.c
+++ b/src/kernel/cli_apps/reboot.c
@@ -4,8 +4,8 @@
 void cli_cmd_reboot(char *args) {
     (void)args;
     cli_write("Rebooting...\n");
-    cli_delay(10000000);
-    while ((inb(0x64) & 2) != 0) cli_delay(1000);
+    cli_sleep(100);
+    while ((inb(0x64) & 2) != 0) cli_sleep(1);
     outb(0x64, 0xFE);
     asm volatile ("int $0x3");
 }
diff --git a/src/kernel/cli_apps/shutdown.c b/src/kernel/cli_apps/shutdown.c
index e642ea8..cb19079 100644
--- a/src/kernel/cli_apps/shutdown.c
+++ b/src/kernel/cli_apps/shutdown.c
@@ -4,7 +4,7 @@
 void cli_cmd_shutdown(char *args) {
     (void)args;
     cli_write("Shutting down...\n");
-    cli_delay(10000000);
+    cli_sleep(100);
     outb(0x64, 0xFE);
     outw(0x604, 0x2000);
     outw(0xB004, 0x2000);
diff --git a/src/kernel/vm.c b/src/kernel/vm.c
index adddf04..26d52a0 100644
--- a/src/kernel/vm.c
+++ b/src/kernel/vm.c
@@ -247,7 +247,7 @@ static void vm_syscall(int id) {
              break;
         }
         case SYS_SLEEP:
-            cli_delay(pop() * 100000);
+            cli_sleep(pop());
             push(0);
             break;
         // File IO - Not supported yet as FILE* cannot be easily passed to VM