Analysis fixes during the integration tests.