Fix up writing in the client
Update the changelog