Fixed db conflict issues. ZMQ/GUI changes