Fixed a few bugs in the round generation