Some integration fix.