Changes and fixes for subclassers