diff --git a/src/Makefile b/src/Makefile
index 07c3042171ce8461fc482464477f0a1846625ae5..be3b124ffd805e4e2547ed9d544b98796a134d5d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -351,7 +351,7 @@ $(CDF_MOD) :
 	CC="$(CC)" CFLAGS="$(NETCDF_OPT)" CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lhdf5_hl -lhdf5 -lsz -laec -lz" && \
 	$(MAKE) && $(MAKE) install && $(MAKE) clean
 	cd ${DIR_CDFF} && ./configure --disable-shared --prefix=${CDF_PATH} --libdir=${CDF_PATH}/lib64 \
-	CC="$(CC)" CFLAGS="$(NETCDF_OPT)" FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" \
+	CC="$(CC)" CFLAGS="$(NETCDF_OPT)" FC="$(FC)" FCFLAGS="$(NETCDF_OPT)" FFLAGS="$(NETCDF_OPT)"  \
 	CPPFLAGS="${INC_NETCDF}" ${CDF_CONF} LDFLAGS="-L${CDF_PATH}/lib64" LIBS="-lnetcdf -lhdf5_hl -lhdf5 -lsz -laec -lz" && \
 	$(MAKE) && $(MAKE) install && $(MAKE) clean
 
diff --git a/src/Rules.LXifort.mk b/src/Rules.LXifort.mk
index 0ded924d2b4c945eacd2a3c4e444a5c02d5ee172..e4c14811ac5c5c6b31bd2924085ae6d82b761a37 100644
--- a/src/Rules.LXifort.mk
+++ b/src/Rules.LXifort.mk
@@ -48,6 +48,11 @@ OPT0      = $(OPT_BASE) $(OPT_PERF0) $(OPT_CHECK)
 OPT_NOCB  = $(OPT_BASE) $(OPT_PERF0)
 CFLAGS   += -g
 endif
+ifeq "$(OPTLEVEL)" "O2"
+OPT       = $(OPT_BASE) $(OPT_PERF2)
+OPT0      = $(OPT_BASE) $(OPT_PERF0)
+OPT_NOCB  = $(OPT_BASE) $(OPT_PERF2)
+endif
 ifeq "$(OPTLEVEL)" "O2PAR"
 PAR= -parallel -diag-file -par-report2
 OPT       = $(OPT_BASE) $(OPT_PERF2) $(PAR)
@@ -66,6 +71,7 @@ OPT_NOCB  = $(OPT_BASE) $(OPT_PERF3)
 endif
 #
 #
+CC = gcc
 FC = ifort
 ifeq "$(VER_MPI)" "MPIAUTO"
 ifneq "$(findstring TAU,$(XYZ))" ""