Fix the path problems