Better _root handling

Change-Id: I6a6a39190f7ca0981dc05948259ba868445d8d21