[All] Fix option parsing