Fix some more paths