Fixes for the cli scripts.