fixups to the beaver-zmq migration after testing