Fixes to Makefile from last build