Root path fixes