Fixes of compilation errors due to use of ->isa