Fixed some build issues.