Use correct pathnames