some more fixes to notify