Fixing up messages v1.2 for tag