diff --git a/kernel-rs/src/interrupts/mod.rs b/kernel-rs/src/interrupts/mod.rs
index dc5a3eef..aba00559 100644
--- a/kernel-rs/src/interrupts/mod.rs
+++ b/kernel-rs/src/interrupts/mod.rs
@@ -5,7 +5,8 @@ lazy_static! {
         let mut idt = Idt::new();
         idt.breakpoint.set_handler_fn(breakpoint_handler);
         idt.double_fault.set_handler_fn(double_fault_handler);
-        idt[0x21].set_handler_fn(::keyboard::kbd_callback);
+        // int #1 is keyboard
+        idt.interrupts[1].set_handler_fn(::keyboard::kbd_callback);
         idt
     };
 }
diff --git a/kernel-rs/src/memory/stack_allocator.rs b/kernel-rs/src/memory/stack_allocator.rs
index 27fec344..3bce908e 100644
--- a/kernel-rs/src/memory/stack_allocator.rs
+++ b/kernel-rs/src/memory/stack_allocator.rs
@@ -1,6 +1,5 @@
-use x86::*;
 use x86::structures::paging::*;
-use memory::paging::{self, ActivePageTable};
+use memory::paging::{ActivePageTable};
 use memory::*;
 use core::ops::Range;