Some fixes for the reports module