diff --git a/core/src/main/java/io/undertow/security/handlers/NotificationReceiverHandler.java b/core/src/main/java/io/undertow/security/handlers/NotificationReceiverHandler.java
index 4f7b60159c..018be89a0b 100644
--- a/core/src/main/java/io/undertow/security/handlers/NotificationReceiverHandler.java
+++ b/core/src/main/java/io/undertow/security/handlers/NotificationReceiverHandler.java
@@ -33,18 +33,18 @@
 public class NotificationReceiverHandler implements HttpHandler {
 
     private final HttpHandler next;
-    private final Collection<NotificationReceiver> receivers;
+    private final NotificationReceiver[] receivers;
 
     public NotificationReceiverHandler(final HttpHandler next, final Collection<NotificationReceiver> receivers) {
         this.next = next;
-        this.receivers = receivers;
+        this.receivers = receivers.toArray(new NotificationReceiver[receivers.size()]);
     }
 
     @Override
     public void handleRequest(HttpServerExchange exchange) throws Exception {
         SecurityContext sc = exchange.getSecurityContext();
-        for (NotificationReceiver receiver : receivers) {
-            sc.registerNotificationReceiver(receiver);
+        for (int i = 0; i < receivers.length; ++i) {
+            sc.registerNotificationReceiver(receivers[i]);
         }
 
         next.handleRequest(exchange);
diff --git a/servlet/src/main/java/io/undertow/servlet/handlers/ServletInitialHandler.java b/servlet/src/main/java/io/undertow/servlet/handlers/ServletInitialHandler.java
index f72a50e029..c521943e18 100644
--- a/servlet/src/main/java/io/undertow/servlet/handlers/ServletInitialHandler.java
+++ b/servlet/src/main/java/io/undertow/servlet/handlers/ServletInitialHandler.java
@@ -142,7 +142,7 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception {
             return;
         } else if (info.getType() == ServletPathMatch.Type.REWRITE) {
             //this can only happen if the path ends with a /
-            //otherwise there would be a rewrite instead
+            //otherwise there would be a redirect instead
             exchange.setRelativePath(exchange.getRelativePath() + info.getRewriteLocation());
             //exchange.setRequestURI(exchange.getRequestURI() + info.getRewriteLocation()); UNDERTOW-348
             exchange.setRequestPath(exchange.getRequestPath() + info.getRewriteLocation());