Fixes for bug 3427