minor fixed w.r.t. session setup