Chat state fixes. Upped to 1.7.0b