Misc changes
Directory walker changes