diff --git a/drivers/ahcid/src/ahci/mod.rs b/drivers/ahcid/src/ahci/mod.rs
index 6cc266f..c3b4219 100644
--- a/drivers/ahcid/src/ahci/mod.rs
+++ b/drivers/ahcid/src/ahci/mod.rs
@@ -11,7 +11,7 @@ pub struct Ahci;
 
 impl Ahci {
     pub fn disks(base: usize, irq: u8) -> Vec<AhciDisk> {
-        println!(" + AHCI on: {:X} IRQ: {:X}", base as usize, irq);
+        println!(" + AHCI on: {:X} IRQ: {}", base as usize, irq);
 
         let pi = unsafe { &mut *(base as *mut HbaMem) }.pi.read();
         let ret: Vec<AhciDisk> = (0..32)
diff --git a/kernel/lib.rs b/kernel/lib.rs
index 91b0000..fee417c 100644
--- a/kernel/lib.rs
+++ b/kernel/lib.rs
@@ -129,7 +129,7 @@ pub fn cpu_id() -> usize {
 }
 
 pub extern fn userspace_init() {
-    assert_eq!(syscall::chdir(b"initfs:bin/"), Ok(0));
+    assert_eq!(syscall::chdir(b"initfs:bin"), Ok(0));
 
     assert_eq!(syscall::open(b"debug:", 0), Ok(0));
     assert_eq!(syscall::open(b"debug:", 0), Ok(1));
diff --git a/programs/login/src/main.rs b/programs/login/src/main.rs
index 6bd6ba4..1e0ca13 100644
--- a/programs/login/src/main.rs
+++ b/programs/login/src/main.rs
@@ -25,10 +25,10 @@ pub fn main() {
             for arg in sh_args.iter() {
                 command.arg(arg);
             }
-            
+
             command.env("HOME", "initfs:");
-            command.env("PWD", "initfs:bin/");
-            command.env("PATH", "initfs:bin/");
+            command.env("PWD", "initfs:bin");
+            command.env("PATH", "initfs:bin");
             command.env("COLUMNS", "80");
             command.env("LINES", "30");
             command.env("TTY", &tty);