Fix cli scripts

Just some minor fixes for the cli scripts.