Makefiles problems fixed