More file manager fixes