More fixes with sessions