cannon state fixes