more fixes for network validation