Minor changes to support dir change