Fixes to report