fixes for Chat errors