Update command line tools after review