Fixup tabbing in Plan