roundtrip bugfixes