fixes for network remapping