Some integration fixes