Updates to fix path issues.