more and more pathfixes