More relative path fixes