Tweak some paths again.