diff --git a/.travis.yml b/.travis.yml
index 85a57f6e3..f05148352 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,8 @@ matrix:
 #        - BTYPE="BINARY=64"
 #
 #    - <<: *test-ubuntu
-      os: linux-ppc64le
+      os: linux
+      arch: ppc64le
       before_script: &common-before
         - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=POWER8 NUM_THREADS=32"
       script:
@@ -43,6 +44,7 @@ matrix:
       arch: s390x
       before_script:
         - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=Z13 NUM_THREADS=32"
+        - sudo apt-get install --only-upgrade binutils
       env:
         # for matrix annotation only
         - TARGET_BOX=IBMZ_LINUX
@@ -55,6 +57,7 @@ matrix:
       compiler: clang
       before_script:
         - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=Z13 NUM_THREADS=32"
+        - sudo apt-get install --only-upgrade binutils
       env:
         # for matrix annotation only
         - TARGET_BOX=IBMZ_LINUX
@@ -269,9 +272,9 @@ matrix:
 #        - CFLAGS="-O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode-11.5.GM.Seed.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS13.5.sdk -arch armv7 -miphoneos-version-min=5.1"
 #        - BTYPE="TARGET=ARMV7 HOSTCC=clang NOFORTRAN=1"
 
-    - &test-graviton2
+    - &test-neoversen1
       os: linux
-      arch: arm64-graviton2
+      arch: arm64
       dist: focal
       group: edge
       virt: lxd
diff --git a/Makefile b/Makefile
index 6db87fa2d..1ed8180b8 100644
--- a/Makefile
+++ b/Makefile
@@ -163,7 +163,7 @@ ifeq ($(CORE), UNKNOWN)
 	$(error OpenBLAS: Detecting CPU failed. Please set TARGET explicitly, e.g. make TARGET=your_cpu_target. Please read README for the detail.)
 endif
 ifeq ($(NOFORTRAN), 1)
-	$(info OpenBLAS: Detecting fortran compiler failed. Cannot compile LAPACK. Only compile BLAS.)
+	$(info OpenBLAS: Detecting fortran compiler failed. Can only compile BLAS and f2c-converted LAPACK.)
 endif
 ifeq ($(NO_STATIC), 1)
 ifeq ($(NO_SHARED), 1)
diff --git a/Makefile.system b/Makefile.system
index e90fd8ffa..1d4ff6da1 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -1041,9 +1041,11 @@ FCOMMON_OPT += -frecursive
 # work around ABI problem with passing single-character arguments
 FCOMMON_OPT += -fno-optimize-sibling-calls
 #Don't include -lgfortran, when NO_LAPACK=1 or lsbcc
+ifneq ($(NOFORTRAN), 1)
 ifneq ($(NO_LAPACK), 1)
 EXTRALIB += -lgfortran
 endif
+endif
 ifdef NO_BINARY_MODE
 ifeq ($(ARCH), $(filter $(ARCH),mips64))
 ifdef BINARY64
@@ -1536,7 +1538,7 @@ override FFLAGS     += $(COMMON_OPT) $(FCOMMON_OPT)
 override FPFLAGS    += $(FCOMMON_OPT) $(COMMON_PROF)
 #MAKEOVERRIDES =
 
-ifdef NEED_PIC
+ifeq ($(NEED_PIC), 1)
 ifeq (,$(findstring PIC,$(FFLAGS)))
 override FFLAGS += -fPIC
 endif
@@ -1566,6 +1568,7 @@ endif
 
 ifdef OS_WINDOWS
 LAPACK_CFLAGS +=  -DOPENBLAS_OS_WINDOWS
+LAPACK_CFLAGS +=  -DLAPACK_COMPLEX_STRUCTURE
 endif
 ifeq ($(C_COMPILER), LSB)
 LAPACK_CFLAGS +=  -DLAPACK_COMPLEX_STRUCTURE
diff --git a/lapack-netlib/SRC/Makefile b/lapack-netlib/SRC/Makefile
index 03e89974d..03d15c23c 100644
--- a/lapack-netlib/SRC/Makefile
+++ b/lapack-netlib/SRC/Makefile
@@ -58,7 +58,6 @@ TOPSRCDIR = ..
 include $(TOPSRCDIR)/make.inc
 
 ifneq ($(C_LAPACK), 1)
-$(info fortran... C_LAPACK ist $(C_LAPACK))
 ALLMOD = la_xisnan.mod la_constants.mod
 
 .SUFFIXES:
@@ -75,7 +74,6 @@ ALLMOD = la_xisnan.mod la_constants.mod
 	@true
 
 else
-$(info C_LAPACK ist $(C_LAPACK))
 .SUFFIXES: .c .o
 .c.o:
 	$(CC) $(CFLAGS) -c -o $@ $<