Fix drive mapping