Fix compilation error.
Merge branch 'improve-path-store' into iow-testing