Chat: Small updates