Fixed Makefiles