Fix variables holding pathnames?