Fixes after testing Notification Engine.