More angular socket cleanup/tweaks