More improvements to ObjectMgr data loads