Proper call-super + nstype fixes