Makefiles updated