fix push notification issues