More fixes for strange network interface configurations