Some cli fixes