diff --git a/docker/routlin-dash/app/factory.py b/docker/routlin-dash/app/factory.py
index c09146e..9e3aaa2 100644
--- a/docker/routlin-dash/app/factory.py
+++ b/docker/routlin-dash/app/factory.py
@@ -860,7 +860,7 @@ def build_table_worker_script(item, expanded_ra_fields):
         return ''
     if nonstandard == {'credentials'}:
         return (
-            f'<script>registerTableWorker({js_str(worker_id)}, (function() {{\n'
+            f'<script>document.addEventListener("DOMContentLoaded",function(){{registerTableWorker({js_str(worker_id)},(function(){{\n'
             '  function _buildCreds(provider, data) {\n'
             '    if (provider === \'noip\') {\n'
             '      return \'<div class="cred-field"><span class="cred-label">U:</span>\' +\n'
@@ -888,9 +888,9 @@ def build_table_worker_script(item, expanded_ra_fields):
             '      });\n'
             '    }\n'
             '  };\n'
-            '}()));</script>\n'
+            '}()));});</script>\n'
         )
-    return f'<script>registerTableWorker({js_str(worker_id)}, {{}});</script>\n'
+    return f'<script>document.addEventListener("DOMContentLoaded",function(){{registerTableWorker({js_str(worker_id)},{{}});}});</script>\n'
 
 # Table cell renderer =================================================
 
diff --git a/routlin/core.py b/routlin/core.py
index fa7528d..2b2f690 100644
--- a/routlin/core.py
+++ b/routlin/core.py
@@ -1573,7 +1573,7 @@ def build_nft_config(data, dry_run=False):
                 if port_spec is not None:
                     line(f"        ip saddr {src} ip daddr {dst} {proto} dport {port_spec} ct state new accept")
                 else:
-                    line(f"        ip saddr {src} ip daddr {dst} {proto} ct state new accept")
+                    line(f"        ip saddr {src} ip daddr {dst} ip protocol {proto} ct state new accept")
             line()
 
     if all_fwd: