Some fixes for file manager stuff
merging