Makefile changes to work with new internal build system