Fixes for NetworkManager