Session efficiency fixes.