fixes some build issues