Fix compile issues with network-api-support (0.0.8)