Better session start/stop handling