Fix two more incompatibilities w/ WenZhe