diff --git a/examples/math/MathEnz.gf b/examples/math/MathEnz.gf
index d30e8114b..394e90e36 100644
--- a/examples/math/MathEnz.gf
+++ b/examples/math/MathEnz.gf
@@ -1,6 +1,6 @@
 --# -path=.:prelude
 
-concrete MathEnz of Math = open Prelude in {
+concrete MathEnz of Mathw = open Prelude in {
 
 flags lexer = textlit ; unlexer = textlit ;
 
diff --git a/examples/math/MathSwz.gf b/examples/math/MathSwz.gf
index 39fdd3374..72e81ae06 100644
--- a/examples/math/MathSwz.gf
+++ b/examples/math/MathSwz.gf
@@ -1,6 +1,6 @@
 --# -path=.:prelude
 
-concrete MathSwz of Math = open Prelude in {
+concrete MathSwz of Mathw = open Prelude in {
 
 flags lexer = textlit ; unlexer = textlit ;
 
diff --git a/src/GF/Canon/CanonToJS.hs b/src/GF/Canon/CanonToJS.hs
index 47d900c9d..78f641139 100644
--- a/src/GF/Canon/CanonToJS.hs
+++ b/src/GF/Canon/CanonToJS.hs
@@ -50,7 +50,7 @@ concrete2js (C.CId a) (C.CId c, cnc) =
     ++ concatMap (cncdef2js l) ds
   where 
    l  = JS.Ident c
-   ds = Map.assocs $ D.lins cnc
+   ds = concatMap Map.assocs [D.lins cnc, D.opers cnc, D.lindefs cnc]
 
 cncdef2js :: JS.Ident -> (C.CId,C.Term) -> [JS.Element]
 cncdef2js l (C.CId f, t) =