Fix HelloCLI and NoteCLI due to merge