Fixes for errors when notifications are clicked