Fix two small regressions with sessionedit
Merge branch 'sessionedit-fix'

* sessionedit-fix:
  Fix two small regressions with sessionedit