more subclassing fixes