more fixes for report