Fix other issues related to partial path match