diff --git a/awips/dataaccess/DataAccessLayer.py b/awips/dataaccess/DataAccessLayer.py
index e768a87..6899cb9 100644
--- a/awips/dataaccess/DataAccessLayer.py
+++ b/awips/dataaccess/DataAccessLayer.py
@@ -49,10 +49,7 @@ import sys
 import subprocess
 import warnings
 
-THRIFT_HOST = subprocess.check_output(
-                    "source /awips2/fxa/bin/setup.env; echo $DEFAULT_HOST",
-                    shell=True).decode().strip()
-
+THRIFT_HOST = "edex"
 
 USING_NATIVE_THRIFT = False
 
diff --git a/dynamicserialize/dstypes/java/util/EnumSet.py b/dynamicserialize/dstypes/java/util/EnumSet.py
index e6af671..44b8a60 100644
--- a/dynamicserialize/dstypes/java/util/EnumSet.py
+++ b/dynamicserialize/dstypes/java/util/EnumSet.py
@@ -37,10 +37,10 @@
 # values to your EnumSet. 
 ##
 
-import collections
+import collections.abc
 
 
-class EnumSet(collections.MutableSet):
+class EnumSet(collections.abc.MutableSet):
     
     def __init__(self, enumClassName, iterable=[]):
         self.__enumClassName = enumClassName