Chat fixes

fix #7