Corrections to CLI handling.