Merge "Fix structural class checks"