A couple of improvements for socketmaster