Fix a couple of options.