Improvements based on import test.