Bug fixes from the 1.10.x release.