Fixed all makefiles