Fixed context path problems.