Fix class/struct mismatch.
Fix non-deprecated build.