Tooling changes, some socket code.