Fixes to better list/control sessions