Tweak to parse_options