fixing up some state change errors