diff --git a/artiq/compiler/testbench/embedding.py b/artiq/compiler/testbench/embedding.py
index 432638f19..7df21af21 100644
--- a/artiq/compiler/testbench/embedding.py
+++ b/artiq/compiler/testbench/embedding.py
@@ -8,7 +8,7 @@ from artiq.coredevice.core import Core, CompileError
 def main():
     with open(sys.argv[1]) as f:
         testcase_code = compile(f.read(), f.name, "exec")
-        testcase_vars = {}
+        testcase_vars = {'__name__': 'testbench'}
         exec(testcase_code, testcase_vars)
 
     ddb_path = os.path.join(os.path.dirname(sys.argv[1]), "ddb.pyon")
diff --git a/artiq/compiler/transforms/asttyped_rewriter.py b/artiq/compiler/transforms/asttyped_rewriter.py
index 15f74f8ca..ee93e0834 100644
--- a/artiq/compiler/transforms/asttyped_rewriter.py
+++ b/artiq/compiler/transforms/asttyped_rewriter.py
@@ -277,7 +277,7 @@ class ASTTypedRewriter(algorithm.Transformer):
         # Its attributes are those of the class environment, but wrapped
         # appropriately so that they are linked to the class from which they
         # originate.
-        instance_type = types.TInstance(node.name)
+        instance_type = types.TInstance(node.name, OrderedDict())
 
         # The second type is the type of the constructor itself (in other words,
         # the class object): it is simply a singleton type that has the class