Updated Makefiles and rebuilt