Push notifications almost work fix #26