more updates for filemanager forking