Latest integration fixes