Make configuration parameters consistent