More path fixing