More path fixing!