diff --git a/Makefile b/Makefile
index c81e4c0..4c41691 100755
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 PERL6=perl6
 
-SOURCES=lib/November/CGI.pm lib/Text/Markup/Wiki/Minimal.pm \
+SOURCES=lib/November/URI/Grammar.pm lib/November/URI.pm \
+	lib/November/CGI.pm lib/Text/Markup/Wiki/Minimal.pm \
 	lib/Text/Markup/Wiki/MediaWiki.pm lib/Digest.pm \
-	lib/November/Storage.pm lib/November/Storage/File.pm lib/November/Tags.pm \
-	lib/November/URI.pm lib/November/URI/Grammar.pm lib/Dispatcher.pm \
-	lib/Dispatcher/Rule.pm lib/November/Session.pm lib/November/Utils.pm \
-    lib/November/Config.pm lib/Test/InputOutput.pm lib/Test/CGI.pm \
+	lib/November/Storage.pm lib/November/Utils.pm \
+	lib/November/Config.pm lib/November/Storage/File.pm lib/November/Tags.pm \
+	lib/Dispatcher/Rule.pm lib/Dispatcher.pm \
+	lib/November/Session.pm lib/November/Utils.pm \
+    lib/Test/InputOutput.pm lib/Test/CGI.pm \
     lib/November/Cache.pm lib/November.pm
 
 PIRS=$(SOURCES:.pm=.pir)
diff --git a/lib/Dispatcher/Rule.pm b/lib/Dispatcher/Rule.pm
index 2a641b2..96de426 100644
--- a/lib/Dispatcher/Rule.pm
+++ b/lib/Dispatcher/Rule.pm
@@ -9,14 +9,14 @@ has Code $.code;
 
 method match (@chunks) {
     return False if @chunks != @!pattern;
-    for @chunks Z @!pattern -> $chunk, Object $rule is copy {
+    for @chunks Z @!pattern -> $chunk, $rule is copy {
 
         my $param;
         if $rule ~~ Pair { ($param, $rule) = $rule.kv }
 
         if ~$chunk ~~ $rule {
             if $param {
-                self."$param" = (~$/ || ~$chunk);
+                self."$param"() = (~$/ || ~$chunk);
             } else {
                 # RAKUDO: /./ ~~ Regex us false, but /./ ~~ Code is true  
                 @!args.push($/ || $chunk) if $rule ~~ Code | Whatever; # should by Regex | Whatever
diff --git a/lib/November/URI/Grammar.pm b/lib/November/URI/Grammar.pm
index 6adadc7..6851619 100644
--- a/lib/November/URI/Grammar.pm
+++ b/lib/November/URI/Grammar.pm
@@ -5,13 +5,7 @@ grammar November::URI::Grammar {
     token authority  { <host> [':' <port>]? };
     token host       { <-[/&?#:]>* };
     token port       { (\d**1..5) 
-                        <?{{ $I0 = match[0]
-                             $I1 = 0
-                             if $I0 > 65535 goto fail
-                             $I1 = 1
-                           fail:
-                             .return ($I1)
-                        }}>
+                        <?{ $0 < 2 ** 16 }>
                        <!before \d> };
     token path       { <slash>? [ <chunk> '/'?]* }; # * mb wrong, because that allow '' URI
     token slash      { '/' };
diff --git a/lib/Text/Markup/Wiki/MediaWiki.pm b/lib/Text/Markup/Wiki/MediaWiki.pm
index d7780ac..898bfc8 100644
--- a/lib/Text/Markup/Wiki/MediaWiki.pm
+++ b/lib/Text/Markup/Wiki/MediaWiki.pm
@@ -42,7 +42,7 @@ class Text::Markup::Wiki::MediaWiki {
         }
 
         my &strip_prefix = {
-            .subst(/'<' ('/'?) <[uo]> 'li>'/, { "<$0li>" }, :g)
+            .subst(/'<' ('/'?) <[uo]> 'li>'/, { '<' ~ $0 ~ 'li>' }, :g)
         };
 
         my &surround_with_list = {