Minor fixes for notifications