Multi-session and fixes