Import order fixes