Some hacks for OSEHRA report for now