FileManager fixes, cleanup.