fix body serialization issues