Misc configuration changes