Broken integration fixes