Fix errors in flavors