Status handling and session fixes