cleaned up some build issues