Adjust session handling