Attempt to fix push notification bugs