Fixed makefiles, first try