more underscore path fixes