Trace file modifications to handle overlap-simulator