Some bugfixes for Unix drive.