Modifications to makefiles