Other modifications to Makefiles