Bugfixes in Makefile