More notification tweaks