Attempt to fix GCM integration