Fixed a few transition bugs