misc fixes for sharing