Small fixes for verbosity mode