Fixes for empty networks