Fixed build issues.