fixes for notifications