Make path more smooth, fix restore issue.