Fix up transitions