Fixed some transitions