Fixes to Chat Controllers