Some build fixes.