diff --git a/Makefile b/Makefile
index 387ac3261..22a363fbb 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,6 @@ ifeq (,$(wildcard Makefile.global))
 endif
 
 include Makefile.global
-# directories with source files
-SUBDIRS +=  $(citus_top_builddir)/src/backend/columnar/safeclib
-ENSURE_SUBDIRS_EXIST := $(shell mkdir -p $(SUBDIRS))
 all: extension
 
 
diff --git a/src/backend/columnar/Makefile b/src/backend/columnar/Makefile
index 9074bef79..c53e55cda 100644
--- a/src/backend/columnar/Makefile
+++ b/src/backend/columnar/Makefile
@@ -3,12 +3,12 @@ citus_top_builddir = ../../..
 safestringlib_srcdir = $(citus_abs_top_srcdir)/vendor/safestringlib
 SUBDIRS = . safeclib
 SUBDIRS +=
+ENSURE_SUBDIRS_EXIST := $(shell mkdir -p $(SUBDIRS))
 OBJS += \
 	$(patsubst $(citus_abs_srcdir)/%.c,%.o,$(foreach dir,$(SUBDIRS), $(sort $(wildcard $(citus_abs_srcdir)/$(dir)/*.c))))
 
 MODULE_big = columnar
 
-
 PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include
 
 include $(citus_top_builddir)/Makefile.global
diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile
index 8d91bdd11..463736015 100644
--- a/src/backend/distributed/Makefile
+++ b/src/backend/distributed/Makefile
@@ -36,12 +36,12 @@ all:
 
 NO_PGXS = 1
 
-SHLIB_LINK += $(libpq)
+SHLIB_LINK = $(libpq)
 SHLIB_LINK_INTERNAL += -L../columnar -l:columnar.so
 override enable_rpath = yes
 include $(citus_top_builddir)/Makefile.global
 
-rpathdir = $(shell $(PG_CONFIG) --libdir):$(shell $(PG_CONFIG) --pkglibdir)
+rpathdir := $(shell $(PG_CONFIG) --libdir):$(shell $(PG_CONFIG) --pkglibdir)
 
 # make sure citus_version.o is recompiled whenever any change is made to the binary or any
 # other artifact being installed to reflect the correct gitref for every build
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index 740c619bb..6636a082a 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -192,8 +192,6 @@ check-operations: all
 	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/operations_schedule $(EXTRA_TESTS)
 
 check-columnar:
-	ldd /usr/lib/postgresql/13/lib/citus.so
-	readelf -d /usr/lib/postgresql/13/lib/citus.so
 	$(pg_regress_multi_check) --load-extension=citus \
 	-- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS)