Tweak paths, although this is still a bit of a mess.