fix more sharing issues