Fixes and ZeroMQ implementation