Fixes to FileManager class