Path resolution cleanup
[ref: CWPBUG-158]