Second round group stage + some other fixes