Fixes for active notifications