Fixes to notifications