More relative/absolute path fixes