fixup! More isinstance fixes