Minor configurational changes