Fix minor issues with new code on this branch.
FossilOrigin-Name: f7fa76d0963e7b34026dc20c920bfbf7961033fe2b99503f6857157595f86823
D
dan committed
d2ffc9721e0cc7ae5362bd80a0a65c4063eb7e18
Parent: 46a6b1a
FossilOrigin-Name: f7fa76d0963e7b34026dc20c920bfbf7961033fe2b99503f6857157595f86823