Fixes for bug #69394