Fixes in filemanager