Some tweaks to reporting class