diff --git a/src/bayesvalidrox/pylink/pylink.py b/src/bayesvalidrox/pylink/pylink.py
index 8899447c57bff01a2f4976d19df4e2033212f7bd..227a51ab38cd834e7e85f6193d83563c7ed3437a 100644
--- a/src/bayesvalidrox/pylink/pylink.py
+++ b/src/bayesvalidrox/pylink/pylink.py
@@ -17,7 +17,6 @@ import multiprocessing
 from functools import partial
 import tqdm
 
-import umbridge # TODO: add this to the imports!?
 #from multiprocessing import get_context
 from multiprocess import get_context
 
@@ -470,9 +469,9 @@ class PyLinkForwardModel(object):
         n_c_points = len(c_points)
         all_outputs = {}
         
-        # TODO: if umbridge, just run, no parallel from here
         # If the link type is UM-Bridge, then no parallel needs to be started from here
         if self.link_type.lower() == 'umbridge':
+            import umbridge 
             if not hasattr(self, 'x_values'):
                 raise AttributeError('For model type `umbridge` the attribute `x_values` needs to be set for the model!')
             # Init model
diff --git a/src/bayesvalidrox/surrogate_models/surrogate_models.py b/src/bayesvalidrox/surrogate_models/surrogate_models.py
index a64a4dc315863b7729c5a025649973a97865dabf..ba488d09639e05c09212cafb32552968e2d03122 100644
--- a/src/bayesvalidrox/surrogate_models/surrogate_models.py
+++ b/src/bayesvalidrox/surrogate_models/surrogate_models.py
@@ -135,6 +135,12 @@ class MetaModel():
 
         """
         
+        # Generate general warnings
+        if self.apply_constraints or self.pce_reg_method.lower() == 'ols':
+            print('THere are no estimations of surrogate uncertainty available'
+                  ' for the chosen regression options. This might lead to issues'
+                  ' in later steps.')
+        
         # Add InputSpace to MetaModel if it does not have any
         if not hasattr(self, 'InputSpace'):
             self.InputSpace = InputSpace(self.input_obj)