URI is used in multiple places, URL seems confusing.
A couple of small fixes.
Merge branch 'zmq-cleanup'