diff --git a/src/basic_mod.F90 b/src/basic_mod.F90
index bc79d1b238f85b376028ec3eeb8c349f126a032b..58e1540758433a363c4880b0f1f9e5599899b67c 100644
--- a/src/basic_mod.F90
+++ b/src/basic_mod.F90
@@ -79,10 +79,10 @@ CONTAINS
     use prec_const
     IMPLICIT NONE
 
-    CALL find_input_file
-
     NAMELIST /BASIC/  nrun, dt, tmax, maxruntime
 
+    CALL find_input_file
+
     READ(lu_in,basic)
 
     !Init cumulative timers
diff --git a/src/coeff_mod.F90 b/src/coeff_mod.F90
index b1c8e2767fc4cfed282fc1cf8bfdfc7c9e8b5cb4..cfd322431a9f2d8b9a4a30dc9835ac9c880b2800 100644
--- a/src/coeff_mod.F90
+++ b/src/coeff_mod.F90
@@ -5,7 +5,6 @@ MODULE coeff
 
 USE PREC_CONST
 use BASIC
-USE MODEL
 USE FMZM
 
 PUBLIC
diff --git a/src/grid_mod.F90 b/src/grid_mod.F90
index dbe904106a93eeaad5e446cd5408c6b030c3cced..4f148d738fba6c58c2ba19d7f9f7cafadd5db338 100644
--- a/src/grid_mod.F90
+++ b/src/grid_mod.F90
@@ -525,7 +525,7 @@ CONTAINS
     ! Ghosts boundaries (depend on the order of z operators)
     IF(Nz .EQ. 1) THEN
       izgs = izs;     izge = ize;
-      zarray(izs,:) = 0; zarray_full(izs) = 0;
+      zarray_full(izs) = 0;
     ELSEIF(Nz .GE. 4) THEN
       izgs = izs - 2; izge = ize + 2;
     ELSE
diff --git a/src/numerics_mod.F90 b/src/numerics_mod.F90
index 8ad05718b22c1b10ede8831361349ec86575d2f1..65d6cea0a9b9eb52e1e0e5288842feeaad186d5c 100644
--- a/src/numerics_mod.F90
+++ b/src/numerics_mod.F90
@@ -3,7 +3,7 @@ MODULE numerics
     USE prec_const
     USE grid
     USE utility
-    USE coeff
+
     implicit none
 
     PUBLIC :: build_dnjs_table, evaluate_kernels, evaluate_EM_op
@@ -117,7 +117,7 @@ SUBROUTINE evaluate_poisson_op
   USE basic
   USE array, Only : kernel_e, kernel_i, inv_poisson_op, inv_pol_ion
   USE grid
-  USE model, ONLY : tau_e, tau_i, q_e, q_i, KIN_E
+  USE model, ONLY : tau_e, tau_i, q_e, q_i, qe2_taue, qi2_taui, KIN_E
   IMPLICIT NONE
   REAL(dp)    :: pol_i, pol_e     ! (Z_a^2/tau_a (1-sum_n kernel_na^2))
   INTEGER     :: ini,ine
@@ -163,7 +163,7 @@ SUBROUTINE evaluate_ampere_op
   USE basic
   USE array, Only : kernel_e, kernel_i, inv_ampere_op
   USE grid
-  USE model, ONLY : tau_e, tau_i, q_e, q_i, KIN_E, beta
+  USE model, ONLY : tau_e, tau_i, q_e, q_i, KIN_E, beta, sigma_e, sigma_i
   USE geometry, ONLY : hatB
   IMPLICIT NONE
   REAL(dp)    :: pol_i, pol_e, kperp2     ! (Z_a^2/tau_a (1-sum_n kernel_na^2))