Bug 833396 - Fix some rooting issues found by static analysis r=sphink