Minor fixes to makefile