Fixed some build issues