More session fixes