Small fixes for 3.0.1 release.