Path fixes done