integration fixes