state fixes