Fixes to makefiles