Output socket fixes, some moving around.