diff --git a/Makefile b/Makefile
index 6860634c6..d5edb054a 100644
--- a/Makefile
+++ b/Makefile
@@ -160,10 +160,10 @@ DIRS += $(UAVOBJGENERATOR_DIR)
 
 .PHONY: uavobjgenerator
 uavobjgenerator: | $(UAVOBJGENERATOR_DIR)
-	$(V1) ( cd $(UAVOBJGENERATOR_DIR) && \
-	    $(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro -spec $(QT_SPEC) -r CONFIG+="$(UAVOGEN_BUILD_CONF) $(UAVOGEN_SILENT)" && \
-	    $(MAKE) --no-print-directory -w ; \
-	)
+	$(V1) cd $(UAVOBJGENERATOR_DIR) && \
+	    $(QMAKE) $(ROOT_DIR)/ground/uavobjgenerator/uavobjgenerator.pro \
+	    -spec $(QT_SPEC) -r CONFIG+=$(UAVOGEN_BUILD_CONF) CONFIG+=$(UAVOGEN_SILENT) && \
+	    $(MAKE) --no-print-directory -w
 
 UAVOBJ_TARGETS := gcs flight python matlab java wireshark
 
@@ -469,9 +469,9 @@ OPENPILOTGCS_MAKEFILE := $(OPENPILOTGCS_DIR)/Makefile
 
 .PHONY: openpilotgcs_qmake
 openpilotgcs_qmake $(OPENPILOTGCS_MAKEFILE): | $(OPENPILOTGCS_DIR)
-	$(V1) ( cd $(OPENPILOTGCS_DIR) && \
-	    $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) \
-	)
+	$(V1) cd $(OPENPILOTGCS_DIR) && \
+	    $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/openpilotgcs.pro \
+	    -spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) CONFIG+=$(GCS_SILENT) $(GCS_QMAKE_OPTS)
 
 .PHONY: openpilotgcs
 openpilotgcs: uavobjects_gcs $(OPENPILOTGCS_MAKEFILE)
@@ -495,9 +495,9 @@ UPLOADER_MAKEFILE := $(UPLOADER_DIR)/Makefile
 
 .PHONY: uploader_qmake
 uploader_qmake $(UPLOADER_MAKEFILE): | $(UPLOADER_DIR)
-	$(V1) ( cd $(UPLOADER_DIR) && \
-	    $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/upload.pro -spec $(QT_SPEC) -r CONFIG+="$(GCS_BUILD_CONF) $(GCS_SILENT)" $(GCS_QMAKE_OPTS) \
-	) 
+	$(V1) cd $(UPLOADER_DIR) && \
+	    $(QMAKE) $(ROOT_DIR)/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/upload.pro \
+	    -spec $(QT_SPEC) -r CONFIG+=$(GCS_BUILD_CONF) CONFIG+=$(GCS_SILENT) $(GCS_QMAKE_OPTS)
 
 .PHONY: uploader
 uploader: $(UPLOADER_MAKEFILE)
@@ -711,7 +711,7 @@ $(OPFW_RESOURCE): $(FW_TARGETS) | $(OPGCSSYNTHDIR)
 
 # If opfw_resource or all firmware are requested, GCS should depend on the resource
 ifneq ($(strip $(filter opfw_resource all all_fw all_flight package,$(MAKECMDGOALS))),)
-    $(eval openpilotgcs_qmake: $(OPFW_RESOURCE))
+$(OPENPILOTGCS_MAKEFILE): $(OPFW_RESOURCE)
 endif
 
 # Packaging targets: package
diff --git a/make/firmware-defs.mk b/make/firmware-defs.mk
index d184c0b05..5f1ed36ee 100644
--- a/make/firmware-defs.mk
+++ b/make/firmware-defs.mk
@@ -136,7 +136,7 @@ endef
 define OPFW_TEMPLATE
 FORCE:
 
-$(1).firmware_info.c: $(1) $(ROOT_DIR)/flight/templates/firmware_info.c.template $(ROOT_DIR)/shared/uavobjectdefinition
+$(1).firmware_info.c: $(1) $(ROOT_DIR)/flight/templates/firmware_info.c.template FORCE
 	@$(ECHO) $(MSG_FWINFO) $$(call toprel, $$@)
 	$(V1) $(VERSION_INFO) \
 		--template=$(ROOT_DIR)/flight/templates/firmware_info.c.template \