more configuration fixes