Minor fixes.
Refactor notify helper from provider.