Use netw provider only, improve foolproof-ness in few places