Fixing notify issues