trace: More dump fixes.