Bug 868312 - Some more rooting fixes for dom r=bz