Small bugfixes in Makefiles