More work on the socket backend
More dependency fixups