Fixes to gcmServer payloads