Resolve remaining errors with pathfinding