Makefile: fixed up some issues revealed by checks