Round handling fixes