Fix cli scripts