Merges some build fixes.