More disk build fixes.