Fix a few imports not ordered properly.