diff --git a/Makefile b/Makefile
index 7ec0ae7..a4e6371 100644
--- a/Makefile
+++ b/Makefile
@@ -57,8 +57,7 @@ build-discovery:
 		-ldflags="-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildTime=${TIME}' \
 			-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildVersion=${VERSION}' \
 			-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildCommitSha=${COMMIT_ID}' \
-			-X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion=${SDK_VERSION}' \
-			-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=MuleSoftDiscoveryAgent'" \
+			-X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion=${SDK_VERSION}'" \
 		-o bin/discovery ./cmd/discovery/main.go
 	@echo "discovery agent binary placed at bin/discovery"
 
@@ -70,8 +69,7 @@ build-traceability:
 		-ldflags="-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildTime=${TIME}' \
 			-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildVersion=${VERSION}' \
 			-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildCommitSha=${COMMIT_ID}' \
-			-X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion=${SDK_VERSION}' \
-			-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentName=MuleSoftTraceabilityAgent'" \
+			-X 'github.com/Axway/agent-sdk/pkg/cmd.SDKBuildVersion=${SDK_VERSION}'" \
 		-o bin/traceability ./cmd/traceability/main.go
 	@echo "traceability agent binary placed at bin/traceability"
 
diff --git a/pkg/traceability/muleemitter.go b/pkg/traceability/muleemitter.go
index 0be79c4..0d3055f 100644
--- a/pkg/traceability/muleemitter.go
+++ b/pkg/traceability/muleemitter.go
@@ -115,6 +115,7 @@ func (me *MuleEventEmitter) getLastRun() (string, string) {
 	}
 	return tStamp.(string), tNow
 }
+
 func (me *MuleEventEmitter) saveLastRun(lastTime string) {
 	me.cache.Set(CacheKeyTimeStamp, lastTime)
 	me.cache.Save(me.cachePath)