diff --git a/src/ash/ClassMap.hx b/src/ash/ClassMap.hx
index 80bdf88..3e9f072 100644
--- a/src/ash/ClassMap.hx
+++ b/src/ash/ClassMap.hx
@@ -2,7 +2,7 @@ package ash;
 
 import haxe.ds.StringMap;
 
-class ClassMap<K:Class<Dynamic>, V> implements Map.IMap<K, V>
+class ClassMap<K:Class<Dynamic>, V> implements haxe.Constraints.IMap<K, V>
 {
     var valueMap:StringMap<V> = new StringMap<V>(); // class name to value
     var keyMap:StringMap<K> = new StringMap<K>(); // class name to class
@@ -45,6 +45,15 @@ class ClassMap<K:Class<Dynamic>, V> implements Map.IMap<K, V>
         return valueMap.iterator();
     }
 
+	public function keyValueIterator():KeyValueIterator<K, V> {
+		return this.keyValueIterator();
+	}
+
+	public inline function copy():haxe.Constraints.IMap<K, V>
+	{
+		return this.copy();
+	}
+	
     public inline function toString():String
     {
         return valueMap.toString();
diff --git a/src/ash/core/Engine.hx b/src/ash/core/Engine.hx
index 4c933c2..53b7e15 100644
--- a/src/ash/core/Engine.hx
+++ b/src/ash/core/Engine.hx
@@ -10,8 +10,8 @@ import ash.signals.Signal1;
  */
 class Engine
 {
-    public var entities(get_entities, never):Iterable<Entity>;
-    public var systems(get_systems, never):Iterable<System>;
+    public var entities(get, never):Iterable<Entity>;
+    public var systems(get, never):Iterable<System>;
 
     private var entityNames:Map<String, Entity>;
     private var entityList:EntityList;
diff --git a/src/ash/core/Entity.hx b/src/ash/core/Entity.hx
index 9c3f5ad..7d3a611 100644
--- a/src/ash/core/Entity.hx
+++ b/src/ash/core/Entity.hx
@@ -28,7 +28,7 @@ class Entity
     /**
      * Optional, give the entity a name. This can help with debugging and with serialising the entity.
      */
-    public var name(default, set_name):String;
+    public var name(default, set):String;
     /**
      * This signal is dispatched when a component is added to the entity.
      */
diff --git a/src/ash/core/NodeList.hx b/src/ash/core/NodeList.hx
index 00961da..45cc054 100644
--- a/src/ash/core/NodeList.hx
+++ b/src/ash/core/NodeList.hx
@@ -101,7 +101,7 @@ class NodeList<TNode:Node<TNode>>
     /**
      * true if the list is empty, false otherwise.
      */
-    public var empty(get_empty, never):Bool;
+    public var empty(get, never):Bool;
 
     private inline function get_empty():Bool
     {