Improved makefiles