diff --git a/pkg/arvo/mar/elem.hoon b/pkg/arvo/mar/elem.hoon
index c7533ad908..6ce6f6f7fe 100644
--- a/pkg/arvo/mar/elem.hoon
+++ b/pkg/arvo/mar/elem.hoon
@@ -6,7 +6,7 @@
 =,  html
 |_  own=manx
 ::
-++  grad  %mime
+++  grad  %noun
 ++  grow                                                ::  convert to
   |%
   ++  hymn  ;html:(head body:"+{own}")                  ::  convert to %hymn
diff --git a/pkg/arvo/mar/helm-hi.hoon b/pkg/arvo/mar/helm-hi.hoon
index 85c617f615..e1d586411b 100644
--- a/pkg/arvo/mar/helm-hi.hoon
+++ b/pkg/arvo/mar/helm-hi.hoon
@@ -6,7 +6,7 @@
 =,  format
 |_  txt=cord
 ::
-++  grad  %mime
+++  grad  %noun
 ++  grab                                                ::  convert from
   |%
   ++  noun  @t                                          ::  clam from %noun
diff --git a/pkg/arvo/mar/hymn.hoon b/pkg/arvo/mar/hymn.hoon
index d8ad099697..cf01508eae 100644
--- a/pkg/arvo/mar/hymn.hoon
+++ b/pkg/arvo/mar/hymn.hoon
@@ -6,7 +6,7 @@
 =,  html
 |_  own=manx
 ::
-++  grad  %mime
+++  grad  %noun
 ++  grow                                                ::  convert to
   |%
   ++  html  (crip (en-xml own))                         ::  convert to %html
diff --git a/pkg/arvo/mar/language-server/rpc/notification.hoon b/pkg/arvo/mar/language-server/rpc/notification.hoon
index 88fdaa8c1b..d464da489a 100644
--- a/pkg/arvo/mar/language-server/rpc/notification.hoon
+++ b/pkg/arvo/mar/language-server/rpc/notification.hoon
@@ -4,7 +4,7 @@
 ++  grad  %noun
 ++  grab
   |%
-  ++  noun  not
+  ++  noun  all:notification
   ++  json
     |=  jon=^json
     (notification:dejs:lsp-json jon)
diff --git a/pkg/arvo/mar/language-server/rpc/request.hoon b/pkg/arvo/mar/language-server/rpc/request.hoon
index 48db6b7eae..989a6f41c4 100644
--- a/pkg/arvo/mar/language-server/rpc/request.hoon
+++ b/pkg/arvo/mar/language-server/rpc/request.hoon
@@ -8,7 +8,7 @@
   --
 ++  grab
   |%
-  ++  noun  req
+  ++  noun  all:request
   ++  json
     |=  jon=^json
     (request:dejs:lsp-json jon)
diff --git a/pkg/arvo/mar/pill.hoon b/pkg/arvo/mar/pill.hoon
index 6d69bd167f..f1e1ffa739 100644
--- a/pkg/arvo/mar/pill.hoon
+++ b/pkg/arvo/mar/pill.hoon
@@ -15,7 +15,7 @@
   ++  mime
     |=  (pair mite octs)
     =+  o=(pair ,* ,*) :: ,*)
-    =+  (,[boot-ova=* kernel-ova=(list o) userspace-ova=(list o)] (cue q.q))
+    =+  (,[%pill nam=term boot-ova=(list) kernel-ova=(list o) userspace-ova=(list o)] (cue q.q))
     =/  convert
       |=  ova=(list o)
       ^-  (list unix-event)
@@ -30,7 +30,7 @@
     ::  =/  boot-ova  (convert boot-ova)
     =/  kernel-ova  (convert kernel-ova)
     =/  userspace-ova  (convert userspace-ova)
-    [boot-ova kernel-ova userspace-ova]
+    [%pill nam boot-ova kernel-ova userspace-ova]
   --
 ++  grad  %mime
 --
diff --git a/pkg/arvo/mar/snip.hoon b/pkg/arvo/mar/snip.hoon
index 205348f495..5760a7bb5e 100644
--- a/pkg/arvo/mar/snip.hoon
+++ b/pkg/arvo/mar/snip.hoon
@@ -43,7 +43,7 @@
 ::
 =,  mimes:html
 |_  [hed=marl tal=marl]
-++  grad  %mime
+++  grad  %noun
 ::
 ++  grow                                                ::  convert to
   |%
@@ -55,6 +55,7 @@
     ++  html  (crip (en-xml hymn))                      ::  convert to %html
     ++  mime  [/text/html (as-octs html)]               ::  convert to %mime
     --
+  ++  noun  [hed tal]
   --
 ++  grab  |%                                            ::  convert from
           ++  noun  ,[marl marl]                        ::  clam from %noun
diff --git a/pkg/arvo/mar/urb.hoon b/pkg/arvo/mar/urb.hoon
index 85686ad6ef..49545e73f5 100644
--- a/pkg/arvo/mar/urb.hoon
+++ b/pkg/arvo/mar/urb.hoon
@@ -6,7 +6,7 @@
 =,  html
 |_  own=manx
 ::
-++  grad  %mime
+++  grad  %noun
 ++  grow                                                ::  convert to
   |%
   ++  hymn  ;html:(head body:"+{own}")                  ::  convert to %hymn
diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon
index a72612b563..af2f653037 100644
--- a/pkg/arvo/sys/vane/clay.hoon
+++ b/pkg/arvo/sys/vane/clay.hoon
@@ -701,6 +701,8 @@
         (compose-casts a !<(mark p.jum) b)
       ?:  ?=(%& -.rab)
         (compose-casts a !<(mark p.rab) b)
+      ?:  ?=(%noun b)
+        :_(nub !>(|=(* +<)))
       ~|(no-cast-from+[a b] !!)
     ::
     ++  compose-casts
diff --git a/pkg/arvo/ted/aqua/behn.hoon b/pkg/arvo/ted/aqua/behn.hoon
index 17a56e0841..1c6c8d8baf 100644
--- a/pkg/arvo/ted/aqua/behn.hoon
+++ b/pkg/arvo/ted/aqua/behn.hoon
@@ -74,13 +74,15 @@
     =.  next-timer  ~
     =.  this
       %-  emit-aqua-events
+      ?^  error
+        ::  Should pass through errors to aqua, but doesn't
+        ::
+        %-  (slog leaf+'aqua-behn: timer failed' u.error)
+        ~
       :_  ~
       ^-  aqua-event
       :+  %event  who
-      :-  //behn/0v1n.2m9vh
-      ?~  error
-        [%wake ~]
-      [%crud %fail u.error]
+      [//behn/0v1n.2m9vh [%wake ~]]
     ..abet-pe
   --
 --