Proper push notification handling