Yep more path fixes