Fix option discovery