Fix integration-test build errors