More root fixes (I hope).