Fix cli options processing.