fix some build issues