Some mods to Makefile