Misc config changes