fix some network related issues