Fixes made to support the new network containers. Testing, fixes, and then PR.