Few more fixes with the converters