Fix file conflicts with filesystem-3.x