Bug fixes from major release version 3.0.0.