diff --git a/scripts/metavar.py b/scripts/metavar.py
index e84cd2b7..691fc729 100755
--- a/scripts/metavar.py
+++ b/scripts/metavar.py
@@ -1632,7 +1632,7 @@ def add_variable(self, newvar, run_env, exists_ok=False, gen_unique=False,
         # end if
         if cvar is not None:
             compat = cvar.compatible(newvar, run_env)
-            if compat:
+            if compat.compat:
                 # Check for intent mismatch
                 vintent = cvar.get_prop_value('intent')
                 dintent = newvar.get_prop_value('intent')
diff --git a/scripts/var_props.py b/scripts/var_props.py
index 21477b4a..660fc10f 100755
--- a/scripts/var_props.py
+++ b/scripts/var_props.py
@@ -950,6 +950,7 @@ def __init__(self, var1_stdname, var1_type, var1_kind, var1_units,
             # Check units argument
             if var1_units != var2_units:
                 # Try to find a set of unit conversions
+                self.__equiv = False
                 self.__unit_transforms = self._get_unit_convstrs(var1_units,
                                                                  var2_units)
             # end if