fixes with new session class