Fixes for reporting and verbosity