More integration fixes. PLZ GOD STOP

123123