relative_path fixes