Fix add_option/remove_option issues PYTHON-546