session fixes