Fixing some build issues.