diff --git a/armsrc/hfsnoop.c b/armsrc/hfsnoop.c
index 4af8522a5..7f641529a 100644
--- a/armsrc/hfsnoop.c
+++ b/armsrc/hfsnoop.c
@@ -31,7 +31,7 @@ void HfSnoop(int samplesToSkip, int triggersToSkip)
 	BigBuf_free(); BigBuf_Clear();
 	
 	Dbprintf("Skipping first %d sample pairs, Skipping %d triggers.\n", samplesToSkip, triggersToSkip);
-	bool trigger_cnt;
+	int trigger_cnt;
 
 	LED_D_ON();
 	// Select correct configs
diff --git a/common/Makefile.common b/common/Makefile.common
index 95820e667..e697ae140 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -99,7 +99,7 @@ $(VERSIONOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
 # See ldscript.common. -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-27
 OBJCOPY_TRANSLATIONS = --no-change-warnings \
 	--change-addresses -0x100000 --change-start 0 \
-	--change-section-address .bss+0 --change-section-address .data+0 \
+	--change-section-address .bss+0 --change-section-address .data-0x100000 \
 	--change-section-address .commonarea+0
 $(OBJDIR)/%.s19: $(OBJDIR)/%.elf
 	$(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@