Minor docopt fixes