Bugfixes for non-shared filesystem