Path fixes

Another attempt