FileManager: Bugfixes after refactor