improvements based on integration test results