Shutting down more concurrency errors.

This SHOULD be the last of them. I just don't see how there could be any more after this. It should also fix #445.