Some more small config changes