Fixed path handling errors.