More fixes to the Makefile