Fix parsing options