Fixing docopt inconsistencies