Fixed other build issues.