Additional session support and fixes.