Fix intergration issues