Corey's network bug fixes.