Fixing up NetworkManager