Updated config and makefiles.