Fix reporting issues