fixes to run locally after Makefile changes