fix some minor build issues