Fix minor build issues