Affiliate report model fixes