Can reroll and a few other methods dealt with.  Will need some
additional testing around these issues because I don't trust them yet.