Update to ZMQ4 (part 2)