various integration fixes