Fix issues with CLI help