Fix from and to paths