Little Session Fixes