Once again fix path problems.