Improve phase marking
Fix trace labeling error