Fix some path issues, avoid unneccessary duplicates.