diff --git a/nodemgr/daemon.go b/nodemgr/daemon.go
index 8c86c1f5..4adf9370 100644
--- a/nodemgr/daemon.go
+++ b/nodemgr/daemon.go
@@ -71,16 +71,17 @@ func (d *Daemon) start(ctx context.Context, wg *sync.WaitGroup, cancel context.C
 
 	wg.Add(1)
 	go func() {
+		defer wg.Done()
 		info := App.retiClient.Info()
 		if info.Config.EntryGatingType == reti.GatingTypeNone {
 			return
 		}
-		defer wg.Done()
 		d.StakerEvictor(ctx)
 	}()
 
 	wg.Add(1)
 	go func() {
+		defer d.logger.Info("Exiting HTTP server")
 		defer wg.Done()
 		http.Handle("/ready", isReady())
 		http.Handle("/metrics", promhttp.Handler())
diff --git a/ui/src/api/contracts.ts b/ui/src/api/contracts.ts
index 4fd56782..badd46c0 100644
--- a/ui/src/api/contracts.ts
+++ b/ui/src/api/contracts.ts
@@ -1189,13 +1189,11 @@ export async function linkPoolToNfd(
       appIndex: nfdAppId,
       from: activeAddress,
       suggestedParams: await ParamsCache.getSuggestedParams(),
-      ...algokit.getAppArgsForTransaction({
-        appArgs: [
-          new TextEncoder().encode('update_field'),
-          new TextEncoder().encode('u.cav.algo.a'),
-          algosdk.decodeAddress(poolAppAddress).publicKey,
-        ],
-      }),
+      appArgs: [
+        new TextEncoder().encode('update_field'),
+        new TextEncoder().encode('u.cav.algo.a'),
+        algosdk.decodeAddress(poolAppAddress).publicKey,
+      ],
     })
 
     // Check balance