#1 - Fixed Makefiles