Even more path fixes