Fix struct/class mismatch