Improve makefiles