Fixes to makefile