Fix the rest of the new chat issues