Fix some conversions + re-matches roundtrip was unreliable