Fix notifications creation and DI references