WM30 figures with some fixups