Fixed issues with the converters