Fix build issues and added drive.