Fix option parsing