post integration fixes