Issue #5907: Fix issues for 3.0 release