diff --git a/fs/ginstall/gftv/ginstall.mk b/fs/ginstall/gftv/ginstall.mk
index 189ae73..67d095c 100644
--- a/fs/ginstall/gftv/ginstall.mk
+++ b/fs/ginstall/gftv/ginstall.mk
@@ -84,7 +84,7 @@
 ifneq ($(findstring $(PLAT_NAME),gftv254),)
 BOLT_DIR = $(call qstrip,$(BR2_TARGET_ROOTFS_GINSTALL_LOADER_DIR))
 ifeq ($(BR2_PACKAGE_GOOGLE_PROD),y)
-_BRUNO_LOADER = android_bolt_signed_release
+_BRUNO_LOADER = bolt_signed_release
 ifeq ($(BR2_PACKAGE_GOOGLE_UNSIGNED),y)
 ROOTFS_GINSTALL_TYPE=prod_unsigned
 else
@@ -94,7 +94,7 @@
 _BRUNO_LOADER = bolt_signed_openbox
 ROOTFS_GINSTALL_TYPE=openbox
 else
-_BRUNO_LOADER = android_bolt_signed_unlocked
+_BRUNO_LOADER = bolt_signed_unlocked
 ROOTFS_GINSTALL_TYPE=unlocked
 endif
 
diff --git a/package/bcm_common/bcm_common.mk b/package/bcm_common/bcm_common.mk
index eb4e02a..c7108fa 100644
--- a/package/bcm_common/bcm_common.mk
+++ b/package/bcm_common/bcm_common.mk
@@ -69,7 +69,8 @@
 URSR_TOP=${BCM_NEXUS_DIR}/.. \
 COMMON_DRM_TOP=${BCM_BSEAV_DIR}/lib/security/common_drm \
 SAGE_SUPPORT=${GOOG_SAGE_SUPPORT} \
-SAGE_SECURE_MODE=6
+SAGE_SECURE_MODE=6 \
+WITH_DEFRAG=1
 
 ifeq ($(findstring $(PLAT_NOQUOTES), 97425 97428), $(PLAT_NOQUOTES))
 BCM_MAKE_ENV += WVCDM_VERSION=2.1
diff --git a/package/bcm_rockford/bcm_rockford.mk b/package/bcm_rockford/bcm_rockford.mk
index fa0454a..d7c6601 100644
--- a/package/bcm_rockford/bcm_rockford.mk
+++ b/package/bcm_rockford/bcm_rockford.mk
@@ -48,7 +48,7 @@
 endif
 
 define BCM_ROCKFORD_BUILD_CMDS
-	$(BCM_MAKE_ENV) $(BCM_ROCKFORD_DEBUG) NEXUS_CLIENT_SUPPORT=y WITH_DEFRAG=1 $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/middleware/v3d/driver -f V3DDriver.mk 
+	$(BCM_MAKE_ENV) $(BCM_ROCKFORD_DEBUG) NEXUS_CLIENT_SUPPORT=y $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/middleware/v3d/driver -f V3DDriver.mk 
 	$(BCM_MAKE_ENV) $(BCM_ROCKFORD_DEBUG) NEXUS_CLIENT_SUPPORT=y $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/middleware/v3d/platform/nexus -f platform_nexus.mk
 	$(BCM_MAKE_ENV) $(BCM_ROCKFORD_DEBUG) NEXUS_CLIENT_SUPPORT=y NEXUS_MODE=client $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/applications/khronos/v3d/nexus/cube
 	$(BCM_MAKE_ENV) $(MAKE) $(BCM_MAKEFLAGS) -C $(@D)/lib/psip