Fixing racing condition on build
Fixing another edge case for ReindentdObjOp