various session fixes