Further fixes to unix_drive.