Bugs fixed:

* Work around ConcurrentModificationExceptions caused by other potential mods
