Push notification bug fixes