Converter change fixes