Makefile changes, other misc. changes