Fixed trusted root problems from merge with master.