Various build fixes.