fw: Fix notification service