More state fixes