Fix some more reporting issues.