Fix compile errors with base-4.8 & `network >= 2.6`

See commit messages for details