Work on 9.2.2; still need to fix compilation