a few more path fixes