Yet more pathing fixes