Fixed some of the configuration to address startup complaints and simplification