Fix paths yet again!