Minor fixes for mis-updated configuration options.