Fixes for cuncreent modfification exceptions.