More path fixes