Fix and document claim/command JSON