Fix issues with CLI