Fixing cli build