even more path fixes