Fixing JSON as the codec on CLI & Server