Fix Concurrent Modification Errors

I hope