various fixes needed for the full report to process