Fixed more pathing issues