Makefile and build improvements