New state fixes