Sharer fixes