Some improvements in transition logic from TOGA to climb