Fixed some minor build issues