Fixes to Makefiles