Bugfixes filesharing