Fix some path issues introduce in the last commits.