Fixed a few bugs with drive not being there