Fixes to the notify command