Add latest fixes to Session branch