fix a few more sharing issues