Fixes to notify