Bug 870442 - Fix some shell rooting hazards and false positives r=terrence