Fix 3rd party import order