Fix some output messages
Add a workaround for subparsers