Intergration fixes