Changes to configuration to work on production