name and session fixes