Added the configuration fixes