view-state fixes