Add couple of fixes during integration tests.