Fix Data sharing

Just a few modifications to get the sharing working successfully.