More pathing

Change-Id: Id486bc4215d70603409a399b1880db7839b685ee