Pathing issue fixes