Makefile updates for new locations, other minor changes