More session fixes.