some fix related to the integration