diff --git a/server/events.go b/server/events.go
index b490a2cb..8955812d 100644
--- a/server/events.go
+++ b/server/events.go
@@ -1574,12 +1574,12 @@ func (s *Server) registerSystemImports(a *Account) {
 
 	// Add in this to the account in 2 places.
 	// "$SYS.REQ.SERVER.PING.CONNZ" and "$SYS.REQ.ACCOUNT.PING.CONNZ"
-	if _, ok := a.imports.services[connzSubj]; !ok {
+	if !a.serviceImportExists(connzSubj) {
 		if err := a.AddServiceImport(sacc, connzSubj, mappedSubj); err != nil {
 			s.Errorf("Error setting up system service imports for account: %v", err)
 		}
 	}
-	if _, ok := a.imports.services[accConnzReqSubj]; !ok {
+	if !a.serviceImportExists(accConnzReqSubj) {
 		if err := a.AddServiceImport(sacc, accConnzReqSubj, mappedSubj); err != nil {
 			s.Errorf("Error setting up system service imports for account: %v", err)
 		}
diff --git a/server/gateway.go b/server/gateway.go
index 75022d03..8e4939d8 100644
--- a/server/gateway.go
+++ b/server/gateway.go
@@ -2824,7 +2824,7 @@ func (c *client) handleGatewayReply(msg []byte) (processed bool) {
 	// If route is nil, we will process the incoming message locally.
 	if route == nil {
 		// Check if this is a service reply subject (_R_)
-		isServiceReply := len(acc.imports.services) > 0 && isServiceReply(c.pa.subject)
+		isServiceReply := isServiceReply(c.pa.subject)
 
 		var queues [][]byte
 		if len(r.psubs)+len(r.qsubs) > 0 {
diff --git a/server/gateway_test.go b/server/gateway_test.go
index 234462c3..bbde745c 100644
--- a/server/gateway_test.go
+++ b/server/gateway_test.go
@@ -3995,13 +3995,13 @@ func TestGatewayServiceImportWithQueue(t *testing.T) {
 
 		// For B, we expect it to send to gateway on the two subjects: test.request
 		// and foo.request then send the reply to the client and optimistically
-		// to the other gateway. Also send on _R_.
+		// to the other gateway.
 		if i == 0 {
-			expected = 5
+			expected = 4
 		} else {
 			// The second time, one of the accounts will be suppressed and the reply going
 			// back so we should get only 2 more messages.
-			expected = 7
+			expected = 6
 		}
 		vz, _ = sb.Varz(nil)
 		if vz.OutMsgs != expected {
diff --git a/server/jetstream_test.go b/server/jetstream_test.go
index 883be034..9e99d9df 100644
--- a/server/jetstream_test.go
+++ b/server/jetstream_test.go
@@ -2817,7 +2817,7 @@ func TestJetStreamWorkQueueAckWaitRedelivery(t *testing.T) {
 					t.Fatalf("Expected these to be marked as redelivered")
 				}
 				// Ack the message here.
-				m.Respond(nil)
+				m.AckSync()
 			}
 
 			if nmsgs, _, _ := sub.Pending(); err != nil || nmsgs != 0 {
@@ -16714,8 +16714,8 @@ func TestJetStreamLimits(t *testing.T) {
 			listen: 127.0.0.1:-1
 			server_name: %s
 			jetstream: {
-				max_mem_store: 2MB, 
-				max_file_store: 8MB, 
+				max_mem_store: 2MB,
+				max_file_store: 8MB,
 				store_dir: '%s',
 				limits: {max_ack_pending: 1000, duplicate_window: "1m"}
 			}