Fix pathnames