Fix make-related build issues