diff --git a/Makefile b/Makefile
index e10caba0..18768dd4 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,7 @@ $(SRAM_LIB_DIR): check-pdk-root
 	@echo "Cloning SRAM library..."
 	@[ -d $(SRAM_LIB_DIR) ] || \
 		git clone $(SRAM_LIB_GIT_REPO) $(SRAM_LIB_DIR)
+	@git -C $(SRAM_LIB_DIR) fetch
 	@git -C $(SRAM_LIB_DIR) checkout $(SRAM_LIB_GIT_COMMIT)
 
 install: $(SRAM_LIB_DIR)
diff --git a/VERSION b/VERSION
index 9ddbe16d..9a83513a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.19
+1.2.22
diff --git a/macros/Makefile b/macros/Makefile
index 58b7f09e..b50db045 100644
--- a/macros/Makefile
+++ b/macros/Makefile
@@ -28,6 +28,8 @@ ROM_SRCS=$(filter-out disabled-% %_common.py,$(sort $(notdir $(wildcard $(ROM_CO
 ROM_DIRS=$(basename $(ROM_SRCS))
 ROM_STAMPS=$(addsuffix .ok,$(ROM_DIRS))
 
+DIRS=$(SRAM_DIRS) $(ROM_DIRS)
+
 configs:
 	@echo
 	@echo "Using OpenRAM at $(OPENRAM_HOME)"
@@ -80,12 +82,12 @@ sram: $(WORKING_SRAM_STAMPS)
 %.ok: sram_configs/%.py
 	@echo "Building $*"
 	@mkdir -p $*
-	@python3 -u $(SRAM_COMPILER) $(OPENRAM_OPTS) -o $* -p $(MACRO_DIR)/$* $(MACRO_DIR)/$< && touch $@
+	@OPENRAM_TMP=$*/tmp python3 -u $(SRAM_COMPILER) $(OPENRAM_OPTS) -o $* -p $(MACRO_DIR)/$* $(MACRO_DIR)/$< && touch $@
 
 %.ok: rom_configs/%.py
 	@echo "Building $*"
 	@mkdir -p $*
-	@python3 -u $(ROM_COMPILER) $(OPENRAM_OPTS) -o $* -p $(MACRO_DIR)/$* $(MACRO_DIR)/$< && touch $@
+	@OPENRAM_TMP=$*/tmp python3 -u $(ROM_COMPILER) $(OPENRAM_OPTS) -o $* -p $(MACRO_DIR)/$* $(MACRO_DIR)/$< && touch $@
 
 .DELETE_ON_ERROR: $(WORKING_SRAM_STAMPS) $(WORKING_ROM_STAMPS)