more state rotation fixes