more CLI validation fixes