Fix option handling