Fix converters to comply spec