Some more trivial rooting changes