Minor adjustments in some options.