Path fixes.. again