Notify fixes and improvements