diff --git a/gpcontrib/Makefile b/gpcontrib/Makefile
index 73a1673032b580be0e3272732c9583d35755af8f..a30a13889e47afee1619aa8ab48fa7ffb73cf72d 100644
--- a/gpcontrib/Makefile
+++ b/gpcontrib/Makefile
@@ -29,26 +29,22 @@ all: gpcloud pxf mapreduce
 
 gpcloud:
 	@if [ "$(enable_gpcloud)" = "yes" ]; then \
-		echo "gpcloud enabled"; \
 		$(MAKE) -C gpcloud && \
 		$(MAKE) -C gpcloud/bin/gpcheckcloud; \
 	fi
 
 pxf:
 	@if [ "$(enable_pxf)" = "yes" ]; then \
-		echo "pxf enabled"; \
 		$(MAKE) -C pxf; \
 	fi
 
 mapreduce:
 	@if [ "$(enable_mapreduce)" = "yes" ]; then \
-		echo "gpmapreduce enabled"; \
 		$(MAKE) -C gpmapreduce; \
 	fi
 
 gphdfs:
 	@if [ "$(enable_gphdfs)" = "yes" ]; then \
-		echo "gphdfs enabled"; \
 		$(MAKE) -C gphdfs; \
 	fi
 
@@ -64,7 +60,9 @@ install:
 	@if [ "$(enable_mapreduce)" = "yes" ]; then \
 		$(MAKE) -C gpmapreduce install; \
 	fi
-	if [ "$(enable_pxf)" = "yes" ]; then $(MAKE) -C pxf install; fi
+	@if [ "$(enable_pxf)" = "yes" ]; then \
+		$(MAKE) -C pxf install; \
+	fi
 	@if [ "$(enable_gphdfs)" = "yes" ]; then \
 		$(MAKE) -C gphdfs docdir=$(INSTLOC)/docs install; \
 	fi
@@ -95,6 +93,5 @@ endif
 
 unittest-check:
 	@if [ "$(enable_pxf)" = "yes" ]; then \
-		echo "pxf enabled"; \
 		$(MAKE) -C pxf unittest-check; \
 	fi
diff --git a/gpcontrib/gpcloud/regress/Makefile b/gpcontrib/gpcloud/regress/Makefile
index d7381b7aa1efeef701066be73753de0e2ab7f0d7..cea4eb9d528ae84d2da0b71e5a2e66f957044408 100644
--- a/gpcontrib/gpcloud/regress/Makefile
+++ b/gpcontrib/gpcloud/regress/Makefile
@@ -1,4 +1,5 @@
-top_builddir = $(shell cd ../../.. && pwd)
+top_builddir = ../../..
+subdir = gpcontrib/gpcloud/regress
 pgxs_dir = $(top_builddir)
 
 config_file := \/home\/gpadmin\/s3\.conf
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index c505e539e777bfb74ceb1794e7abfd891f89fcfc..70f11828c88a862596b0a07454f69641bccde589 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -224,7 +224,7 @@ PTHREAD_CFLAGS		= @PTHREAD_CFLAGS@
 PTHREAD_LIBS		= @PTHREAD_LIBS@
 
 have_yaml 		= @have_yaml@
-with_zstd = @with_zstd@
+with_zstd 		= @with_zstd@
 
 
 ##########################################################################