Further improvements to reports