Minor fixes to notifications