Correct pathnames and links