More bug fixes on group chat