Initial fixes
Initial fixes
Merge branch 'patch-session'