more session fixes