Minor cosmetic improvements, report definition updates