Fixes for bug 14119