Fix Share BUGs