Fix a few import ordering issues.