diff --git a/Make.inc.in b/Make.inc.in
index 0e75547f..88933099 100755
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -5,7 +5,8 @@
 # These lines are quite portable.
 .mod=@MODEXT@
 .fh=.fh
-.SUFFIXES: .f90 $(.mod) .F90 .F .f03 .F03
+.SUFFIXES: 
+.SUFFIXES: .f90 .F90 .f .F .f03 .F03 .c .o
 
 
 # The following ones are the variables used by the PSBLAS make scripts.
diff --git a/base/modules/Makefile b/base/modules/Makefile
index 8ce37c35..886391ed 100644
--- a/base/modules/Makefile
+++ b/base/modules/Makefile
@@ -36,7 +36,7 @@ lib:  $(BASIC_MODS) penvmod  $(UTIL_MODS)  $(OBJS)  $(LIBMOD)
 
 
 psi_penv_mod.o: psi_comm_buffers_mod.o psb_const_mod.o psb_realloc_mod.o 
-psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o penvmod.o: psi_penv_mod.o	
+psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o: psi_penv_mod.o	
 psb_penv_mod.o: psi_bcast_mod.o psi_reduce_mod.o psi_p2p_mod.o 
 
 psb_base_mat_mod.o: psb_string_mod.o psb_sort_mod.o psb_ip_reord_mod.o\
diff --git a/base/modules/psi_penv_mod.F90 b/base/modules/psi_penv_mod.F90
index c0e2ce50..42abcc0b 100644
--- a/base/modules/psi_penv_mod.F90
+++ b/base/modules/psi_penv_mod.F90
@@ -246,7 +246,7 @@ contains
 #ifdef MPI_H
     include 'mpif.h'
 #endif
-    integer, intent(in) :: ictxt
+    integer, intent(inout) :: ictxt
     logical, intent(in), optional :: close
     logical  :: close_
     integer  :: info
diff --git a/configure b/configure
index 413d00d3..b44aaf8a 100755
--- a/configure
+++ b/configure
@@ -10551,34 +10551,20 @@ CDEFINES=$(PSBCDEFINES)
 FDEFINES=$(PSBFDEFINES)
 
 
-$(.mod).o:
-
 # These should be portable rules, arent they?
 .c.o:
 	$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $<
 .f.o:
 	$(FC) $(FCOPT) $(FINCLUDES)  -c $<
-.f$(.mod):
-	$(F90) $(FCOPT) $(FINCLUDES) -c $<
-.f90$(.mod):
-	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .f90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
+.f03.o:
+	$(F03) $(F03COPT) $(FINCLUDES) -c $<
 .F.o:
 	$(FC)  $(FCOPT)   $(FINCLUDES) $(FDEFINES) -c $<
-.F$(.mod):
-	$(FC)  $(FCOPT)   $(FINCLUDES) $(FDEFINES) -c $<
 .F90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
-.F90$(.mod):
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
-.f03$(.mod):
-	$(F03) $(F03COPT) $(FINCLUDES) -c $<
-.f03.o:
-	$(F03) $(F03COPT) $(FINCLUDES) -c $<
 .F03.o:
-	$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<
-.F03$(.mod):
 	$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'
 
 
diff --git a/configure.ac b/configure.ac
index 4810811b..9891b761 100755
--- a/configure.ac
+++ b/configure.ac
@@ -723,34 +723,20 @@ CDEFINES=$(PSBCDEFINES)
 FDEFINES=$(PSBFDEFINES)
 	
 
-$(.mod).o:
-	
 # These should be portable rules, arent they?
 .c.o:
 	$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $<
 .f.o:
 	$(FC) $(FCOPT) $(FINCLUDES)  -c $<
-.f$(.mod):
-	$(F90) $(FCOPT) $(FINCLUDES) -c $<
-.f90$(.mod):
-	$(F90) $(F90COPT) $(FINCLUDES) -c $<
 .f90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) -c $<
+.f03.o:
+	$(F03) $(F03COPT) $(FINCLUDES) -c $<
 .F.o:
 	$(FC)  $(FCOPT)   $(FINCLUDES) $(FDEFINES) -c $<
-.F$(.mod):
-	$(FC)  $(FCOPT)   $(FINCLUDES) $(FDEFINES) -c $<
 .F90.o:
 	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
-.F90$(.mod):
-	$(F90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
-.f03$(.mod):
-	$(F03) $(F03COPT) $(FINCLUDES) -c $<
-.f03.o:
-	$(F03) $(F03COPT) $(FINCLUDES) -c $<
 .F03.o:
-	$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<
-.F03$(.mod):
 	$(F03) $(F03COPT) $(FINCLUDES) $(FDEFINES) -c $<'