Fixing makefiles