diff --git a/fixcore/fixcore/model/typed_model.py b/fixcore/fixcore/model/typed_model.py
index a12f6dfdc9..7f0339a2bc 100644
--- a/fixcore/fixcore/model/typed_model.py
+++ b/fixcore/fixcore/model/typed_model.py
@@ -25,7 +25,7 @@ def type_fqn(tpe: type) -> str:
 
 
 def from_js(json: JsonElement, clazz: Type[AnyT]) -> AnyT:
-    return jsons.load(json, cls=clazz) if clazz != dict else json  # type: ignore
+    return jsons.load(json, cls=clazz) if clazz is not dict else json  # type: ignore
 
 
 def to_js(node: Any, **kwargs: Any) -> Json:
diff --git a/fixlib/test/core/model_export_test.py b/fixlib/test/core/model_export_test.py
index f628b98ada..3893a27922 100644
--- a/fixlib/test/core/model_export_test.py
+++ b/fixlib/test/core/model_export_test.py
@@ -83,8 +83,8 @@ def test_collection() -> None:
     assert is_collection(list) is True
     assert is_collection(dict) is False
 
-    assert type_arg(Optional[List[int]]) == int
-    assert type_arg(List[datetime]) == datetime
+    assert type_arg(Optional[List[int]]) is int
+    assert type_arg(List[datetime]) is datetime
 
 
 def test_dictionary() -> None:
diff --git a/plugins/azure/tools/azure_model_gen.py b/plugins/azure/tools/azure_model_gen.py
index e14d12b9d6..7b8e2f3534 100644
--- a/plugins/azure/tools/azure_model_gen.py
+++ b/plugins/azure/tools/azure_model_gen.py
@@ -539,7 +539,7 @@ def fill_sequence(seq, index, value_index_type):
         while len(seq) < index:
             seq.append(None)
 
-        if value_index_type == int:
+        if value_index_type is int:
             seq.append([])
         elif value_index_type is None:
             seq.append(None)