Fixes for notifications system