More integration fixes. Most of the things should be working.