Path fixes