Final tweaks to the options.