Makefile: bugfixes