further integration fixes