diff --git a/c_os/user/demo/KeyboardDemo.cc b/c_os/user/demo/KeyboardDemo.cc
index c392d73..998569d 100755
--- a/c_os/user/demo/KeyboardDemo.cc
+++ b/c_os/user/demo/KeyboardDemo.cc
@@ -9,7 +9,6 @@
  *****************************************************************************/
 
 #include "user/demo/KeyboardDemo.h"
-#include "lib/Input.h"
 
 void KeyboardDemo::run() {
 
@@ -19,8 +18,6 @@ void KeyboardDemo::run() {
 
     while (true) {
         kout << listener.waitForKeyEvent();
-
-        // kout << getch();
         kout.flush();
     }
 }
diff --git a/c_os/user/demo/PCSPKdemo.cc b/c_os/user/demo/PCSPKdemo.cc
index 1f7bee8..9a15fff 100644
--- a/c_os/user/demo/PCSPKdemo.cc
+++ b/c_os/user/demo/PCSPKdemo.cc
@@ -1,8 +1,9 @@
 #include "user/demo/PCSPKdemo.h"
 
 void PCSPKdemo::run() {
+    kout << "Playing..." << endl;
     (pcspk.*this->melody)();  // This syntax is confusing as hell
+    kout << "Finished" << endl;
 
-    pcspk.off();
     scheduler.exit();
 }