Thread safety fixes for mirrored collections