Fixes with class recursion, function recognition