Various tweaks for release of v1.10