CHEF-4102: make command line options work