Fixes to Makefile