Network Manager Fixes