Fixed different things for beta