Resolve ambiguous SessionInfo production. Fix other dependency issues