Makefile misc fix