Adding the configuration fixes