Fix kv marshaller