Fix some more sharing data