Fix basic client bugs and surplus serialization