Some path fixing. This needs to be more save.