cdpath fixes