don't suppress errors, fix them instead
fix class names for Yd calls