Fix cli a bit