Bug fixes for network monitoring