Made some tweaks to config establishment.