Reporting Fixes