some session fixes