Some fixes to reports

wait