More corrections
Finalized session fixes