CORE-3963: fixed a few sharing bugs