Minor optimisation around path resolving to root folder - may revisit this