diff --git a/Makefile b/Makefile
index 34ffcae..ac353b7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,24 @@ fmt:
 	@echo "Running gofumpt..."
 	find . -name '*.go' -exec gofumpt -w -s -extra {} \;
 
-migrate:
-	go build -o migrate ./cmd/migrate
+CGO_ENABLED=0
 
-unmigrate:
-	go build -o unmigrate ./cmd/unmigrate
+all:	bin migrate unmigrate forkfix orgfix
 
-forkfix:
-	go build -o forkfix ./cmd/forkfix
+bin:
+	mkdir -p ./bin
+
+migrate: bin
+	go build --tags=netgo,osusergo -o ./bin/migrate ./cmd/migrate
+
+unmigrate: bin
+	go build --tags=netgo,osusergo -o ./bin/unmigrate ./cmd/unmigrate
+
+forkfix: bin
+	go build --tags=netgo,osusergo -o ./bin/forkfix ./cmd/forkfix
+
+orgfix: bin
+	go build --tags=netgo,osusergo -o ./bin/orgfix ./cmd/orgfix
+
+clean:
+	rm -f ./bin/migrate ./bin/unmigrate ./bin/forkfix ./bin/orgfix
\ No newline at end of file
diff --git a/utils/mentions.go b/utils/mentions.go
index c8d95d7..9c21084 100644
--- a/utils/mentions.go
+++ b/utils/mentions.go
@@ -29,8 +29,7 @@ func ExtractUserMentions(text string) []string {
 	}
 
 	// Ignore everything we found and return nothing
-	return []string{}
-	//return result
+	return []string{""}
 }
 
 // NormalizeMentions replaces all @mentions in text with their normalized versions