A few minor fixes. See JM_changelog.