Fix path names, part 2