diff --git a/PW/src/pw_restart_new.f90 b/PW/src/pw_restart_new.f90
index cdca6cda3..4939877f7 100644
--- a/PW/src/pw_restart_new.f90
+++ b/PW/src/pw_restart_new.f90
@@ -135,7 +135,8 @@ MODULE pw_restart_new
       USE control_flags,        ONLY : conv_elec, conv_ions, ldftd3
       USE input_parameters,     ONLY :  ts_vdw_econv_thr, ts_vdw_isolated
       !
-      USE wvfct_gpum,           ONLY : using_et
+      USE wvfct_gpum,           ONLY : using_et, using_wg
+      USE wavefunctions_gpum,   ONLY : using_evc
       !
       IMPLICIT NONE
       !
@@ -196,6 +197,8 @@ MODULE pw_restart_new
       ! If local PW dimensions are not available, set to 0
       !
       CALL using_et(0)
+      CALL using_wg(0)
+      CALL using_evc(0)
       !
       ALLOCATE( ngk_g( nkstot ) )
       ngk_g(:) = 0
@@ -682,8 +685,8 @@ MODULE pw_restart_new
       USE mp_pools,             ONLY : intra_pool_comm, inter_pool_comm
       USE mp_bands,             ONLY : my_bgrp_id, root_bgrp, intra_bgrp_comm,&
                                        root_bgrp_id, nbgrp
-      USE wavefunctions_gpum, ONLY : using_evc
-      USE wvfct_gpum,                ONLY : using_et
+      USE wavefunctions_gpum,   ONLY : using_evc
+      USE wvfct_gpum,           ONLY : using_et
       !
       IMPLICIT NONE
       !
diff --git a/PW/src/wfcinit_gpu.f90 b/PW/src/wfcinit_gpu.f90
index 2fee9b0ea..395a4d256 100644
--- a/PW/src/wfcinit_gpu.f90
+++ b/PW/src/wfcinit_gpu.f90
@@ -31,7 +31,7 @@ SUBROUTINE wfcinit_gpu()
   USE wannier_new,          ONLY : use_wannier
   USE pw_restart_new,       ONLY : pw_readschema_file, read_collected_to_evc
   USE qes_types_module,     ONLY : output_type
-  USE qes_libs_module,      ONLY : qes_reset_output
+  USE qes_libs_module,      ONLY : qes_reset
   !
   USE wavefunctions_gpum,   ONLY : using_evc_d, using_evc
   USE uspp_gpum,            ONLY : vkb_d, using_vkb_d
@@ -81,7 +81,7 @@ SUBROUTINE wfcinit_gpu()
            END IF
         END IF
      END IF
-     CALL qes_reset_output ( output_obj ) 
+     CALL qes_reset ( output_obj ) 
   END IF
   !
   ! ... state what will happen