Convert paths to generic form

Might not have caught all places where this should be done.