Fix filesystem path regressions