More relative_path fixes