some more path fixing