Some more path updates. Should all work fine now.