Fix some converter edge cases.