namespace fixes, merge fixes
notification fix