Fixes to gcmServer