Typo fixes, add network dep
Merge from upstream/master