Additional Zhu JY subclassing fixes