Fix/829 file mode profiler issues