Fix CLI's inability to handle basic control operations