Add more explicit config and connection options.