Push out some more changes to automate configuration.