Fix CLI Examples per #13357