docopt fixes