Fixed possible collisions in message format/packing.