More fixes/ideas in the mockup for zmq