Added some missing state transitions