Fixing notify actions bugs