Summary: Changes required for network refactor branch

Reported-by: Brian Angus <blangus@betterservers.com>
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358554509 -0700