Fix missing 'phase->2D' changes