More fixing of absolute-relative paths.