Bug-fix update before 4.0 release.