Various integration fixes