Some more configuration updates