Fixed some reporting bugs