Fix network/session token issues