Fix a few reporting issues.