A couple of little tweaks. More GCM changes (in GCM intent service)