NOJIRA Fixes for reporting (again)