Small fixes for sharing