Fix regression bugs in client/server comm