diff --git a/home.mk b/home.mk
index c75e542..c2af8ca 100644
--- a/home.mk
+++ b/home.mk
@@ -18,6 +18,7 @@
 
 include $(ROOTDIR)/build/preamble.mk
 
+ifneq ($(HOME_SIZE_MB),)
 HOME_DIR := $(PRODUCT_OUT)/obj/HOME
 HOME_RAW_IMG := $(PRODUCT_OUT)/obj/HOME/home.raw.img
 HOME_IMG := $(PRODUCT_OUT)/home.img
@@ -48,3 +49,4 @@
 	@echo "home - creates the home partition image"
 
 .PHONY:: home home_raw
+endif
diff --git a/packages.mk b/packages.mk
index d5cbe24..167a281 100644
--- a/packages.mk
+++ b/packages.mk
@@ -45,7 +45,7 @@
 		--basetgz $@ \
 		--othermirror "deb [trusted=yes] http://packages.cloud.google.com/apt mendel-day main|deb [trusted=yes] http://packages.cloud.google.com/apt mendel-bsp-$(BOARD_NAME)-day main" \
 		--distribution buster \
-		--architecture $(QEMU_ARCH) \
+		--architecture $(USERSPACE_ARCH) \
 		--extrapackages "build-essential debhelper gnupg lintian" \
 		--aptcache ""
 	mkdir -p $(ROOTDIR)/cache/base-tmp