more fixes related to bug #65715