session: fixes