some more integration fixes