diff --git a/src/app-layer-tls-detect-version.c b/src/app-layer-tls-detect-version.c
index 5380e98b6f..796fbbab11 100644
--- a/src/app-layer-tls-detect-version.c
+++ b/src/app-layer-tls-detect-version.c
@@ -313,7 +313,6 @@ static int AppLayerTlsDetectVersionTestDetect01(void) {
     }
 
     SigGroupBuild(de_ctx);
-    PatternMatchPrepare(mpm_ctx, MPM_B2G);
     DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
 
     int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf1, tlslen1, FALSE);
@@ -376,7 +375,6 @@ end:
     SigCleanSignatures(de_ctx);
 
     DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
-    PatternMatchDestroy(mpm_ctx);
     DetectEngineCtxFree(de_ctx);
 
     return result;
@@ -427,7 +425,6 @@ static int AppLayerTlsDetectVersionTestDetect02(void) {
     }
 
     SigGroupBuild(de_ctx);
-    PatternMatchPrepare(mpm_ctx, MPM_B2G);
     DetectEngineThreadCtxInit(&th_v, (void *)de_ctx, (void *)&det_ctx);
 
     int r = AppLayerParse(&f, ALPROTO_TLS, STREAM_TOSERVER, tlsbuf1, tlslen1, FALSE);
@@ -490,7 +487,6 @@ end:
     SigCleanSignatures(de_ctx);
 
     DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
-    PatternMatchDestroy(mpm_ctx);
     DetectEngineCtxFree(de_ctx);
 
     return result;
diff --git a/src/detect-parse.c b/src/detect-parse.c
index c4d3c118b6..57f3bdc23b 100644
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -999,8 +999,6 @@ static int SigParseTestAppLayerTLS01(void) {
 
     result = 1;
 end:
-    if (s->alproto == 0) {
-        printf("alproto not set: ");
     if (s != NULL)
         SigFree(s);
     if (de_ctx != NULL)
diff --git a/src/detect.c b/src/detect.c
index a1e2ae0244..cbf06a3c83 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -398,13 +398,13 @@ static int SigMatchSignaturesAppLayer(ThreadVars *th_v, DetectEngineCtx *de_ctx,
 
         /* check the source address */
         if (!(s->flags & SIG_FLAG_SRC_ANY)) {
-            DetectAddressGroup *saddr = DetectAddressLookupGroup(&s->src,&p->src);
+            DetectAddress *saddr = DetectAddressLookupInHead(&s->src,&p->src);
             if (saddr == NULL)
                 continue;
         }
         /* check the destination address */
         if (!(s->flags & SIG_FLAG_DST_ANY)) {
-            DetectAddressGroup *daddr = DetectAddressLookupGroup(&s->dst,&p->dst);
+            DetectAddress *daddr = DetectAddressLookupInHead(&s->dst,&p->dst);
             if (daddr == NULL)
                 continue;
         }