Path selection fixes