diff --git a/legacy/eobj/src/lib/eo.c b/legacy/eobj/src/lib/eo.c
index 3a5a9a60e9..5d323b1432 100644
--- a/legacy/eobj/src/lib/eo.c
+++ b/legacy/eobj/src/lib/eo.c
@@ -124,7 +124,7 @@ _dich_chain_alloc(Dich_Chain1 *chain1)
 static inline void
 _dich_copy_all(Eo_Class *dst, const Eo_Class *src)
 {
-   Eo_Class_Id i;
+   Eo_Op i;
    const Dich_Chain1 *sc1 = src->chain;
    Dich_Chain1 *dc1 = dst->chain;
    for (i = 0 ; i <= DICH_CHAIN1(src->base_id) ; i++, sc1++, dc1++)
diff --git a/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c b/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c
index 5b0a705010..983ff2cfc6 100644
--- a/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c
+++ b/legacy/eobj/src/tests/eo_suite/eo_test_class_errors.c
@@ -254,13 +254,13 @@ START_TEST(eo_bad_interface)
    class_desc.class_constructor = _stub_class_constructor;
 
    klass = eo_class_new(&class_desc, 0, NULL, NULL);
-   fail_if(klass);
+   fail_if(!klass);
 
    class_desc.class_constructor = NULL;
    class_desc.class_destructor = _stub_class_constructor;
 
    klass = eo_class_new(&class_desc, 0, NULL, NULL);
-   fail_if(klass);
+   fail_if(!klass);
 
    class_desc.class_destructor = NULL;