Fixes for notifications