Fix a few issues introduced in the latest release.