Fix CLI go and ge