Fix more pathing issues