Updated reports to render correctly