bug fixes for notifications