Tweaks for 1.4.x release.