Few network fixes