Small changes to default gateway selection handler