Quick fixes for KO 3.3. Not heavily tested yet.
Fixing CLI check.