Further manual build fixes.