More notification fixes and auto session store picking