Fix standalone version CLI stuff.