More CLI fixes to the option validation.