minor fixes to make session specs pass again