BZ998 Improve determination of network interfaces