diff --git a/lib/xos-config/tests/test_config.py b/lib/xos-config/tests/test_config.py
index 29635ce..1684472 100644
--- a/lib/xos-config/tests/test_config.py
+++ b/lib/xos-config/tests/test_config.py
@@ -91,7 +91,7 @@
         """
         with self.assertRaises(Exception) as e:
             Config.init(yaml_not_valid)
-        self.assertEqual(e.exception.message, "[XOS-Config] The config format is wrong: Unable to load any data from source yaml file")
+        self.assertTrue(e.exception.message.startswith("[XOS-Config] The config format is wrong:"))
 
     def test_invalid_format(self):
         """
diff --git a/lib/xos-genx/xosgenx/targets/grpc_api.xtarget b/lib/xos-genx/xosgenx/targets/grpc_api.xtarget
index 4d05870..dffc347 100644
--- a/lib/xos-genx/xosgenx/targets/grpc_api.xtarget
+++ b/lib/xos-genx/xosgenx/targets/grpc_api.xtarget
@@ -1,13 +1,13 @@
 import base64
 import time
-from protos import xos_pb2
+from protos import xos_pb2, xos_pb2_grpc
 from google.protobuf.empty_pb2 import Empty
 
 from django.contrib.auth import authenticate as django_authenticate
 from xos.exceptions import *
 from apihelper import XOSAPIHelperMixin, translate_exceptions
 
-class XosService(xos_pb2.xosServicer, XOSAPIHelperMixin):
+class XosService(xos_pb2_grpc.xosServicer, XOSAPIHelperMixin):
     def __init__(self, thread_pool):
         self.thread_pool = thread_pool
         XOSAPIHelperMixin.__init__(self)