Fix some things in the Makefiles