More path fixing, more logs