diff --git a/src/main/scala/millfork/env/Environment.scala b/src/main/scala/millfork/env/Environment.scala
index fbc9d1ec..370fe7fd 100644
--- a/src/main/scala/millfork/env/Environment.scala
+++ b/src/main/scala/millfork/env/Environment.scala
@@ -240,7 +240,7 @@ class Environment(val parent: Option[Environment], val prefix: String, val cpuFa
     }
   }
   
-  private def root: Environment = parent.fold(this)(_.root)  
+  def root: Environment = parent.fold(this)(_.root)
 
   def maybeGet[T <: Thing : Manifest](name: String): Option[T] = {
     if (things.contains(name)) {
@@ -1108,6 +1108,7 @@ class Environment(val parent: Option[Environment], val prefix: String, val cpuFa
 
   def nameCheck(node: Node): Unit = node match {
     case _:MosAssemblyStatement => ()
+    case _:Z80AssemblyStatement => ()
     case _:DeclarationStatement => ()
     case s:ForStatement =>
       checkName[Variable]("Variable", s.variable, s.position)