Fix -? and -V output