Fixes on notification system with GCM