More changes from bug 63895