Fix small build issues