Fixing issues with CLI install setup