Fix for bug 906266, bug 906230, and bug 906233