Bug fixes wrt path issues.