Applied a couple of fixes to the Makefile