additional network and trust related fixes