Rolling in Chris fixes for chat boxes