Minor fixes applied to Makefile