Fixes for merge problem on ReportAd