Fixing issues with notifications