Notifications Fixes