Thread safety changes in objmap2