Fixed the configuration issues