Share fixes