Paths fix due to new Source version