fix gcm message structures