Another try at fixing relative paths