Fixes to bug 13382