Makefile: fixes