Minor integration fixes