Fix option bugs