Fix import ordering