Misc configuration changes.