Block state fixes