Fixed bugs in notifications and redirects