Minor fixes, datagram/payload mutex