Fix stuff in Subclass PR