Fixes to reports