Add some fixes for empty reports
Remove debug