Drive fixes.