Fixed setup round bugs