Fix: backported support for more network interfaces