Fixed some issues with the new upgrade generation system that could break rerolls later in the game.
These changes may also prevent other issues with not being offered certain upgrades even if levels remain, but let me know in the comments if you encounter any issues going forward.