Some small fixes and push notification stuff