Fixing notifications