Minor changes to OneCLI