Fix a couple of obvious wire server bugs