Makefile and configure updates