More fixes to the makefile