more integration fixes