Fix subclass issues