diff --git a/src/gam/util/batch.py b/src/gam/util/batch.py
index f9d226ab..93873e2e 100644
--- a/src/gam/util/batch.py
+++ b/src/gam/util/batch.py
@@ -19,7 +19,8 @@ import time
 from gamlib import glapi as API
 from gamlib import glclargs
 from gamlib import glcfg as GC
-from gamlib import glentity as Ent
+from gamlib import glentity
+Ent = glentity.GamEntity()
 from gamlib import glglobals as GM
 from gamlib import glmsgs as Msg
 
diff --git a/src/gam/util/config.py b/src/gam/util/config.py
index cdccbe78..fc4da100 100644
--- a/src/gam/util/config.py
+++ b/src/gam/util/config.py
@@ -23,9 +23,11 @@ from gamlib import glaction
 Act = glaction.GamAction()
 from gamlib import glapi as API
 from gamlib import glcfg as GC
-from gamlib import glentity as Ent
+from gamlib import glentity
+Ent = glentity.GamEntity()
 from gamlib import glglobals as GM
-from gamlib import glindent as Ind
+from gamlib import glindent
+Ind = glindent.GamIndent()
 from gamlib import glmsgs as Msg
 from gamlib import glskus as SKU
 
diff --git a/src/gam/util/gdoc.py b/src/gam/util/gdoc.py
index c00eebcc..d6ac66e7 100644
--- a/src/gam/util/gdoc.py
+++ b/src/gam/util/gdoc.py
@@ -17,7 +17,8 @@ import google.auth.exceptions
 
 from gamlib import glapi as API
 from gamlib import glcfg as GC
-from gamlib import glentity as Ent
+from gamlib import glentity
+Ent = glentity.GamEntity()
 from gamlib import glgapi as GAPI
 from gamlib import glglobals as GM
 from gamlib import glmsgs as Msg