Fix issues with shared data