Fixes for non-eth0 devices