diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make
index e8ecc3d22d..7b56ced575 100644
--- a/apps/codecs/codecs.make
+++ b/apps/codecs/codecs.make
@@ -101,7 +101,7 @@ endif
 $(CODECDIR)/%.codec: $(CODECDIR)/%.o
 	$(call PRINTS,LD $(@F))$(CC) $(CODECFLAGS) -o $(CODECDIR)/$*.elf \
 		$(filter %.o, $^) \
-		$(filter %.a, $^) \
+		$(filter %.a, $+) \
 		-lgcc $(CODECLDFLAGS)
 ifdef SIMVER
 	$(SILENT)cp $(CODECDIR)/$*.elf $@
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 8be87b94c1..58e05473e7 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -94,8 +94,8 @@ else
 	$(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@
 endif
 
-$(BUILDDIR)/%.refmap: $(BUILDDIR)/%.o $(OVERLAYREF_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB)
+$(BUILDDIR)/%.refmap: $(BUILDDIR)/%.o $(APPSDIR)/plugin.h $(OVERLAYREF_LDS) $(PLUGINLIB) $(PLUGINBITMAPLIB)
 	$(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o /dev/null \
 		$(filter %.o, $^) \
-		$(filter %.a, $^) \
+		$(filter %.a, $+) \
 		-lgcc $(OVERLAYLDFLAGS)