diff --git a/config/default b/config/default
index 55c3fa322860f1c013eebe659bac3d84e11297e9..7883d2672de0701ead88587ed040002bb6653ecf 100755
--- a/config/default
+++ b/config/default
@@ -37,7 +37,7 @@ case "${HOSTNAME}" in
                     --with-zlib=/sw/etch-ia32/zlib-1.2.3 \
                     --with-szlib=$HOME/local/etch-ia32 \
                     LIBS=-ljpeg \
-	            CC=gcc CFLAGS="-g -O2 -Wall -W -Wfloat-equal -pedantic" CFINT=-Df2cFortran
+	            CC=gcc CFLAGS="-g -O2 -Wall -W -Wfloat-equal -pedantic"
 	;;
 # sparc-sun-solaris2.8
     xxf)
diff --git a/src/Makefile.am b/src/Makefile.am
index ebaf482015a99a12ca0030b6e36af2ee792b301a..bde2e5bbda937896c22ac3114236182dd979cc8d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -99,13 +99,13 @@ cdiFortran.o: cdiFortran.c
 	source='$<' object='$@' libtool=no \
 	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
 	$(CCDEPMODE) $(depcomp) \
-	$(COMPILE) $(CFINT) $(REAL4) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) $(CFINT) -c `test -f '$<' || echo '$(srcdir)/'`$<
 #
 cdilib.c:
 	$(top_srcdir)/src/make_cdilib $(top_srcdir)/src
 #
 cdilib.o: cdilib.c
-	$(COMPILE) $(CFINT) $(REAL4) -c $<
+	$(COMPILE) $(CFINT) -c $<
 #
 all-local: $(LOCALTARGETS) 
 
diff --git a/src/Makefile.in b/src/Makefile.in
index f1d76db9b02f8004d8fcc3b076794ac4371985cf..bd6ca31e6cbe0d629506356ea36cfa1547a8cbf6 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -678,13 +678,13 @@ cdiFortran.o: cdiFortran.c
 	source='$<' object='$@' libtool=no \
 	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
 	$(CCDEPMODE) $(depcomp) \
-	$(COMPILE) $(CFINT) $(REAL4) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(COMPILE) $(CFINT) -c `test -f '$<' || echo '$(srcdir)/'`$<
 #
 cdilib.c:
 	$(top_srcdir)/src/make_cdilib $(top_srcdir)/src
 #
 cdilib.o: cdilib.c
-	$(COMPILE) $(CFINT) $(REAL4) -c $<
+	$(COMPILE) $(CFINT) -c $<
 #
 all-local: $(LOCALTARGETS) 
 #
diff --git a/src/stream_cdf.c b/src/stream_cdf.c
index 029aae071528029738176128840dc4cb84f20e79..ffdb13d7fcc4d052d9683742f102ff7f5d8b3da8 100644
--- a/src/stream_cdf.c
+++ b/src/stream_cdf.c
@@ -3287,9 +3287,11 @@ int cdfReadVarSliceDP(int streamID, int varID, int levelID, double *data, int *n
     {
       if ( yid == dimids[ndims] && xid == dimids[ndims+1] && zid == dimids[ndims+2] )
 	swapyxz = TRUE;
+      if ( zid == dimids[ndims] && xid == dimids[ndims+1] && yid == dimids[ndims+2] )
+	swapxy = TRUE;
     }
 
-  if ( swapyxz == FALSE && zid != UNDEFID && yid != UNDEFID )
+  if ( swapyxz == FALSE && swapxy == FALSE && zid != UNDEFID && yid != UNDEFID )
     {
       if ( zid == dimids[ndims] && yid == dimids[ndims+1] )
 	swapyz = FALSE;
@@ -5190,13 +5192,13 @@ int cdfInqContents(int streamID)
 
 	  if ( nxdims == 2 )
 	    {
-	      xdimid = xdimids[0];
-	      ydimid = xdimids[1];
+	      xdimid = xdimids[1];
+	      ydimid = xdimids[0];
 	    }
 	  else if ( nydims == 2 )
 	    {
-	      xdimid = ydimids[0];
-	      ydimid = ydimids[1];
+	      xdimid = ydimids[1];
+	      ydimid = ydimids[0];
 	    }
 	  else
 	    {