Standard config update pass

This hotfix is big enough to require a full pass.