UDP issues and workarounds

As per https://github.com/spark/docs/pull/169