Some more configuration tweeks