Fixed some transitioning issues