Fix ZMQ issues