driveintogap bug fixes