Fixing merge issues

And getting integration tests passed.