Bug fix for EntityManager.Clear + first pass at Enum support