Misc config updates