Fixing issues related to bad formed paths