Fix some build issues.