Improve handling of verbosity