diff --git a/Makefile b/Makefile
index c43d3bcdc..489189d5d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@ lint: frontend-lint backend-lint
 test: frontend-test backend-test i18n-check
 
 .PHONY: backend-%
-backend-%: .develop.env .stack-work.lock --stack-work-$*
-	# $(MAKE) -- --backend-$*
-	( $(MAKE) -- --backend-$* || $(MAKE) -- --stack-krow-$* ) && ( $(MAKE) -- --stack-krow-$* )
+backend-%: .develop.env .stack-work.lock # --stack-work-$*
+	$(MAKE) -- --backend-$*
+	#( $(MAKE) -- --backend-$* || $(MAKE) -- --stack-krow-$* ) && ( $(MAKE) -- --stack-krow-$* )
 
 .PHONY: --backend-build
 --backend-build: .develop.env
@@ -44,7 +44,7 @@ i18n-check:
 	@echo No missing translations.
 
 .PHONY: database
-database: .develop.env .stack-work.lock --stack-work-build
+database: .develop.env .stack-work.lock # --stack-work-build
 	# $(MAKE) -- --database
 	( $(MAKE) -- --database || $(MAKE) -- --stack-krow-build ) && ( $(MAKE) -- --stack-krow-build )
 
@@ -97,18 +97,18 @@ clean:
 
 .PHONY: .develop.env
 .develop.env:
-	[ ! -z $(CI) || ! -z "$$PORT_OFFSET" ] || ( echo "Not in develop!" 2>&1 ; exit 1 )
+	[[ ! -z "$(CI)" || ! -z "$$PORT_OFFSET" ]] || ( echo "Not in develop!" 2>&1 ; exit 1 )
 
-.PHONY: --stack-work-%
---stack-work-%: .stack-work.lock
-	[[ -d .stack-work && -d .stack-work-$* ]] && (echo ".stack-work collides with .stack-work-$*, please resolve manually" 1>&2; exit 1) || :
-	[[ ! -d .stack-work-$* ]] || mv .stack-work-$* .stack-work
-
-.PHONY: --stack-krow-%
---stack-krow-%:
-	[[ ! -d .stack-work-$* ]] || ( echo ".stack-work-$* already exists, please resolve manually" 1>&2 ; exit 1 )
-	mv .stack-work .stack-work-$*
-	flock -u .stack-work.lock true
+# .PHONY: --stack-work-%
+# --stack-work-%: .stack-work.lock
+# 	[[ -d .stack-work && -d .stack-work-$* ]] && (echo ".stack-work collides with .stack-work-$*, please resolve manually" 1>&2; exit 1) || :
+# 	[[ ! -d .stack-work-$* ]] || mv .stack-work-$* .stack-work
+# 
+# .PHONY: --stack-krow-%
+# --stack-krow-%:
+# 	[[ ! -d .stack-work-$* ]] || ( echo ".stack-work-$* already exists, please resolve manually" 1>&2 ; exit 1 )
+# 	mv .stack-work .stack-work-$*
+# 	flock -u .stack-work.lock true
 
 # watch:
 # 	while true; do \