Add minor changes to converters