More minor changes to NetworkManager