Fix some configuration when using default options.