More path fixes...