Reports fixes