More cli fixes